From 59e0cfcbec46b7aa2d9f6c06ebbd420e7be2b978 Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Tue, 27 Dec 2016 18:49:35 +0000 Subject: [PATCH] dbq docker --- www/dbq/docker-compose.yaml | 2 ++ www/dbq/etc/nginx/default.conf | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/www/dbq/docker-compose.yaml b/www/dbq/docker-compose.yaml index 300db01c..cbfb0328 100644 --- a/www/dbq/docker-compose.yaml +++ b/www/dbq/docker-compose.yaml @@ -20,6 +20,8 @@ services: #entrypoint: "/usr/local/sbin/php-fpm" nginx: +# NB 27.12.16 entrypoint: sh -c '. /etc/profile && sed -e "s/\(^[\t ]*listen[\t ]*\)localhost:/\1/" -e "s,^\([\t ]*fastcgi_pass[\t ]*\).*,\1php:9000;," $NB_ROOT/www/dbq/etc/nginx/default.conf > /etc/nginx/conf.d/default.conf && exec nginx -g "daemon off; error_log /dev/stdout info;"' +# NB 27.12.16 image: nginx:alpine build: context: ../Docker/nginx/ args: diff --git a/www/dbq/etc/nginx/default.conf b/www/dbq/etc/nginx/default.conf index 109add2e..dbafb366 100644 --- a/www/dbq/etc/nginx/default.conf +++ b/www/dbq/etc/nginx/default.conf @@ -1,7 +1,5 @@ server { - listen localhost:1973 default_server; - #listen 10.8.0.1:1973 default_server; - #listen 192.168.3.1:1973 default_server; + listen 1973 default_server; server_name dbq dbq.*; root /opt/nb/www/dbq/html; index index.php index.html; @@ -63,7 +61,6 @@ server { fastcgi_param DBQ_PERM 0; fastcgi_param DBQ_PARAM_DB ls; fastcgi_param PRODUCTION 1; - #fastcgi_param DBQ_TITLE 'Local Db'; } } -- 2.47.3