]> git.nbdom.net Git - nb.git/commitdiff
docker.sh
authorNicolas Boisselier <nicolas.boisselier@gmail.com>
Tue, 29 Nov 2016 12:17:32 +0000 (12:17 +0000)
committerNicolas Boisselier <nicolas.boisselier@gmail.com>
Tue, 29 Nov 2016 12:17:32 +0000 (12:17 +0000)
src/Docker/Compose/dbq/docker-compose.yaml
src/Docker/nginx/Dockerfile
www/dbq/index.php

index cf4ad2f8e9f4a0010b9f536ebeac30fb9490175d..d5b69419a417047f305018578b829160aa91d259 100644 (file)
@@ -1,25 +1,32 @@
-app:
-  image: php:7.0-fpm-alpine
-  volumes:
-    #- ./../../../..:/opt/nb
-    - ./../../../../..:/opt
-    - ./../../../../www/dbq:/var/www/html
-    #- ./:/var/www/html
-    #- ./../../../../lib/php/db:/var/www/html
-  command: "echo . /opt/nb/etc/profile > /etc/profile.d/nb.sh"
-php:
-  build: ../../php/
-  volumes_from:
-    - app
-  expose:
-    - 9000
+version: '2'
+services:
+  app:
+    image: php:7.0-fpm-alpine
+    environment:
+      NB_ROOT: /opt/nb
+    volumes:
+      #- ./../../../..:/opt/nb
+      - ./../../../../..:/opt
+      - ./../../../../www/dbq:/var/www/html
+      #- ./:/var/www/html
+      #- ./../../../../lib/php/db:/var/www/html
+    command: "echo . $NB_ROOT/etc/profile > /etc/profile.d/nb.sh"
+  php:
+    build: ../../php/
+    volumes_from:
+      - app
+    expose:
+      - 9000
 
-nginx:
-  build: ../../nginx/
-  #image: nginx:latest
-  volumes_from:
-    - php
-  ports:
-    - "8080:80"
-  links:
-    - php
+  nginx:
+    build:
+      context: ../../nginx/
+      args:
+        - WWW_ROOT=$NB_ROOT/www/dbq
+    #image: nginx:latest
+    volumes_from:
+      - php
+    ports:
+      - "8080:80"
+    links:
+      - php
index ccdd0dacf7fd232ee489f04483690214c44817b7..d8e3f0cd9f9b72764f75589a370f0514ffc86242 100644 (file)
@@ -1,4 +1,7 @@
 FROM nginx:latest
+ARG WWW_ROOT
+ENV WWW_ROOT=${WWW_ROOT:-/var/www/html}
 COPY ./default.conf /etc/nginx/conf.d/default.conf
-RUN mkdir -p /var/www/html && echo '<html><head><title>Welcom to Nginx</title></head><body><h1>Welcom to Nginx</h1></body></html>' > /var/www/html/index.html
+RUN sed -ie 's,^\([\t ]*root \).*$,\1'$WWW_ROOT';,' /etc/nginx/conf.d/default.conf
+RUN mkdir -p $WWW_ROOT && echo '<html><head><title>Welcom to Nginx</title></head><body><h1>Welcom to Nginx</h1></body></html>' > $WWW_ROOT/index.html
 CMD nginx -g 'daemon off;'
index 26ee66f19b970bd8bdba4da00161ccc6548422bd..4f96b8e7cee6e788f7cae1a14317808e5e259525 100644 (file)
@@ -1,3 +1,3 @@
 <?php
-require_once(dirname(__FILE__).'/../../lib/php/db/page.php');
+require_once($_SERVER['DOCUMENT_ROOT'].'/../../lib/php/db/page.php');
 ?>