-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from jonbrouse/refactor-alpine-docker-compose-v2
Refactor alpine docker compose v2
- Loading branch information
Showing
12 changed files
with
211 additions
and
174 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,38 @@ | ||
| elasticsearch: | ||
| image: jonbrouse/elk:elasticsearch | ||
| extends: | ||
| file: docker-compose-common.yml | ||
| service: elasticsearch | ||
| volumes: | ||
| - ./elasticsearch/volumes/esdata/:/opt/elasticsearch/data | ||
| logstash: | ||
| image: jonbrouse/elk:logstash | ||
| extends: | ||
| file: docker-compose-common.yml | ||
| service: logstash | ||
| links: | ||
| - elasticsearch | ||
| kibana: | ||
| image: jonbrouse/elk:kibana | ||
| extends: | ||
| file: docker-compose-common.yml | ||
| service: kibana | ||
| links: | ||
| - elasticsearch | ||
| nginx: | ||
| build: nginx | ||
| extends: | ||
| file: docker-compose-common.yml | ||
| service: nginx | ||
| links: | ||
| - kibana | ||
| version: '2' | ||
| services: | ||
| elasticsearch: | ||
| hostname: elasticsearch | ||
| image: jonbrouse/elk:elasticsearch | ||
| build: elasticsearch | ||
| command: -Des.insecure.allow.root=true | ||
| volumes: | ||
| - ./elasticsearch/volumes/esdata/:/opt/elasticsearch/data | ||
| logstash: | ||
| hostname: logstash | ||
| image: jonbrouse/elk:logstash | ||
| build: logstash | ||
| ports: | ||
| - "24642:24642" | ||
| command: -f /etc/logstash.conf | ||
| tty: true | ||
| volumes: | ||
| - ./logstash/assets/logstash.conf:/etc/logstash.conf | ||
| links: | ||
| - elasticsearch | ||
| kibana: | ||
| hostname: kibana | ||
| image: jonbrouse/elk:kibana | ||
| build: kibana | ||
| links: | ||
| - elasticsearch | ||
| nginx: | ||
| hostname: nginx | ||
| image: nginx:stable-alpine | ||
| links: | ||
| - kibana | ||
| ports: | ||
| - "80:80" | ||
| - "443:443" | ||
| volumes: | ||
| - ./nginx/assets/certs:/etc/nginx/certs | ||
| - ./nginx/assets/nginx.conf:/etc/nginx/nginx.conf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
|
|
||
| #user nobody; | ||
| worker_processes 1; | ||
|
|
||
| #error_log logs/error.log; | ||
| #error_log logs/error.log notice; | ||
| #error_log logs/error.log info; | ||
|
|
||
| #pid logs/nginx.pid; | ||
|
|
||
|
|
||
| events { | ||
| worker_connections 1024; | ||
| } | ||
|
|
||
|
|
||
| http { | ||
| include mime.types; | ||
| default_type application/octet-stream; | ||
|
|
||
| #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' | ||
| # '$status $body_bytes_sent "$http_referer" ' | ||
| # '"$http_user_agent" "$http_x_forwarded_for"'; | ||
|
|
||
| #access_log logs/access.log main; | ||
|
|
||
| sendfile on; | ||
| #tcp_nopush on; | ||
|
|
||
| #keepalive_timeout 0; | ||
| keepalive_timeout 65; | ||
|
|
||
| #gzip on; | ||
|
|
||
| server { | ||
| listen 80; | ||
| return 301 https://$host$request_uri; | ||
| server_name localhost; | ||
|
|
||
| #error_page 404 /404.html; | ||
|
|
||
| # redirect server error pages to the static page /50x.html | ||
| # | ||
| error_page 500 502 503 504 /50x.html; | ||
| location = /50x.html { | ||
| root html; | ||
| } | ||
| } | ||
|
|
||
| server { | ||
|
|
||
| listen 443; | ||
|
|
||
| ssl_certificate /etc/nginx/certs/example_com.full_chain.pem; | ||
| ssl_certificate_key /etc/nginx/certs/example_com.key; | ||
|
|
||
| ssl on; | ||
| ssl_session_cache builtin:1000 shared:SSL:10m; | ||
| ssl_protocols TLSv1 TLSv1.1 TLSv1.2; | ||
| ssl_ciphers HIGH:!aNULL:!eNULL:!EXPORT:!CAMELLIA:!DES:!MD5:!PSK:!RC4; | ||
| ssl_prefer_server_ciphers on; | ||
|
|
||
| location / { | ||
|
|
||
| proxy_set_header Host $host; | ||
| proxy_set_header X-Real-IP $remote_addr; | ||
| proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
| proxy_set_header X-Forwarded-Proto $scheme; | ||
|
|
||
| # Fix the “It appears that your reverse proxy set up is broken" error. | ||
| proxy_pass http://kibana:5601; | ||
| proxy_read_timeout 90; | ||
|
|
||
| proxy_redirect http://kibana:5601 http://$host; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
Oops, something went wrong.