Update Nginx, add makefile #48
Conversation
misterbisson
commented
May 18, 2017
misterbisson
commented
- Updated Nginx for changes in cache the curl nginx#49
- This required moving the config file around
- Added a makefile for easier building and pushing
docker-compose.yml
Outdated
| # An demo version of WordPress for easy scaling | ||
| wordpress: | ||
| image: autopilotpattern/wordpress:4.7.3-r4.0.0 | ||
| image: autopilotpattern/wordpress:branch-add-makefile |
There was a problem hiding this comment.
This needs to be updated to the new version, once pushed
docker-compose.yml
Outdated
| # Nginx as a load-balancing tier and reverse proxy | ||
| nginx: | ||
| image: autopilotpattern/wordpress-nginx:4.7.3-r4.0.0 | ||
| image: autopilotpattern/wordpress-nginx:branch-add-makefile |
There was a problem hiding this comment.
This needs to be updated to the new version, once pushed
| # it is included here for demo purposes and is not required | ||
| prometheus: | ||
| image: autopilotpattern/prometheus:latest | ||
| image: autopilotpattern/prometheus:branch-triton-support |
There was a problem hiding this comment.
This is waiting on autopilotpattern/prometheus#18
nginx/Dockerfile
Outdated
| @@ -1,5 +1,5 @@ | |||
| # a minimal Nginx container including containerbuddy and a simple virtulhost config | |||
| FROM autopilotpattern/nginx:1-r6.1.0 | |||
| FROM autopilotpattern/nginx:branch-48-nginx_connections_unhandled_total-appears-incorrect | |||
There was a problem hiding this comment.
This needs to be autopilotpattern/nginx:1.13-rXXX once autopilotpattern/nginx#49 is merged
| { | ||
| "consul": "{{ if .CONSUL_AGENT }}localhost{{ else }}{{ .CONSUL }}{{ end }}:8500", | ||
| "preStart": "/usr/local/bin/reload.sh preStart", | ||
| "preStart": "generate-config", |
There was a problem hiding this comment.
This changed after autopilotpattern/nginx:1-r6.1.0
| "name": "wordpress", | ||
| "poll": 7, | ||
| "onChange": "/usr/local/bin/reload.sh" | ||
| "onChange": "reload" |
There was a problem hiding this comment.
This changed after autopilotpattern/nginx:1-r6.1.0
| "type": "gauge", | ||
| "poll": 5, | ||
| "check": ["/usr/local/bin/sensor.sh", "unhandled"] | ||
| "check": ["sensor", "unhandled"] |
There was a problem hiding this comment.
This changed after autopilotpattern/nginx:1-r6.1.0
| "type": "gauge", | ||
| "poll": 5, | ||
| "check": ["/usr/local/bin/sensor.sh", "connections_load"] | ||
| "check": ["sensor", "connections_load"] |
There was a problem hiding this comment.
This changed after autopilotpattern/nginx:1-r6.1.0
| @@ -1,107 +0,0 @@ | |||
| user nginx; | |||
There was a problem hiding this comment.
After autopilotpattern/nginx:1-r6.1.0 the config files were moved around. See new conf files added elsewhere.
| alias /var/www/acme/challenge; | ||
| } | ||
|
|
||
| {{ if service "wordpress" }} |
There was a problem hiding this comment.
This block inside {{ if service "wordpress" }} is the only block that's needed here. Everything else is likely to be repeated for other consumers of the Nginx image.
| include ssl.conf; | ||
| {{ end }} | ||
|
|
||
| {{ if service "wordpress" }} |
There was a problem hiding this comment.
This block inside {{ if service "wordpress" }} is the only block that's needed here. Everything else is likely to be repeated for other consumers of the Nginx image.
