From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Tue, 24 Oct 2017 09:36:41 +0000 (+0100)
Subject: docker-compose.yaml
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=c06bb821c53e1306411deed755d603e930d3d889;p=nb.git

docker-compose.yaml
---

diff --git a/www/dbq/docker-compose.yaml b/www/dbq/docker-compose.yaml
index b73ec829..33337706 100644
--- a/www/dbq/docker-compose.yaml
+++ b/www/dbq/docker-compose.yaml
@@ -18,14 +18,9 @@ services:
       - $HOME:/Users/$USER
       - $HOME/.dbq:/etc/dbq
       - $HOME/ownCloud/var/lib/sqlite:/var/lib/sqlite
-# NB 16.12.16     network_mode: "host"
-    #entrypoint: sh -c "echo . $NB_ROOT/etc/profile > /etc/profile.d/nb.sh && /usr/local/sbin/php-fpm"
     entrypoint: sh -c "echo . $NB_ROOT/etc/profile > /etc/profile.d/nb.sh && echo _www:x:50:www-data >> /etc/group && /usr/local/sbin/php-fpm"
-    #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
     environment:
       NB_ROOT: /opt/nb
     build:
@@ -33,10 +28,6 @@ services:
       args:
         - WWW_ROOT=$NB_ROOT/www/dbq/html
         - FASTCGI_PASS=php:9000
-        #- FASTCGI_PASS=unix:/var/run/php5-fpm.sock
-        #- CONF=$NB_ROOT/www/dbq/etc/nginx/default.conf
-    #volumes:
-      #- ./etc/nginx:/etc/nginx/conf.d/
     volumes_from:
       - php
     links: