From fd5b5c096e109af640ba718dc71c1a97911146dd Mon Sep 17 00:00:00 2001 From: Tim de Pater Date: Thu, 18 Feb 2016 11:40:48 +0100 Subject: [PATCH] Made the upstream host/port a environment variable --- docker-compose.yml | 3 +++ nginx/Dockerfile | 6 ++++++ nginx/nginx.conf | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e38cf2b..4edb78c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,3 +14,6 @@ nginx: - appdata ports: - 80:80 + environment: + - UPSTREAM_HOST=fpm + - UPSTREAM_PORT=9000 diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 8749058..efdcb2f 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,3 +1,9 @@ FROM nginx:1.9 COPY nginx.conf /etc/nginx/conf.d/app.conf + +CMD /bin/bash -c envsubst < /etc/nginx/conf.d/app.conf.template > /etc/nginx/conf.d/app.conf && nginx -g 'daemon off;' + +CMD sed -i 's/UPSTREAM_HOST/'"$UPSTREAM_HOST"'/g' /etc/nginx/conf.d/app.conf \ + && sed -i 's/UPSTREAM_PORT/'"$UPSTREAM_PORT"'/g' /etc/nginx/conf.d/app.conf \ + && nginx -g 'daemon off;' diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 92717cc..b6f72b8 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -36,7 +36,7 @@ server { location ~ \.php$ { try_files $uri =404; fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass fpm:9000; + fastcgi_pass UPSTREAM_HOST:UPSTREAM_PORT; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_NAME $fastcgi_script_name; fastcgi_index index.php;