fixed

taogov · Jan 23, 2019 · 6ebffbd · 6ebffbd
1 parent 208dc30
commit 6ebffbd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,6 +3,7 @@ services:
     web:
         image: nginx:alpine
         volumes:
+            - "./code:/var/www/demo"
             - "./etc/nginx/nginx.conf:/etc/nginx/nginx.conf"
             - "${WEB_CODE_DIR}:/var/www/code"
             - "./logs/nginx:/etc/nginx/logs"
@@ -23,6 +24,7 @@ services:
         volumes:
             - "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini"
             - "${WEB_CODE_DIR}:/var/www/code"
+            - "./code:/var/www/demo"
     php5:
         build: ./php5
         restart: always

diff --git a/etc/nginx/nginx.conf b/etc/nginx/nginx.conf
@@ -33,7 +33,7 @@ http {
         index index.php index.html;
         error_log  /var/log/nginx/error.log;
         access_log /var/log/nginx/access.log;
-        root /var/www/code;
+        root /var/www/demo;
 
         location ~ \.php$ {
             try_files $uri =404;

diff --git a/php5/Dockerfile b/php5/Dockerfile
@@ -28,7 +28,7 @@ RUN curl -L -o /tmp/redis.tar.gz https://github.com/phpredis/phpredis/archive/$P
     && mkdir -p /usr/src/php/ext \
     && mv phpredis-$PHPREDIS_VERSION /usr/src/php/ext/redis \
     && docker-php-ext-install redis \
-    && rm -rf /usr/src/php
-    && docker-php-ext-install mysqli
-    && docker-php-ext-enable mysqli
+    && rm -rf /usr/src/php \
+    && docker-php-ext-install mysqli \
+    && docker-php-ext-enable mysqli \
     && docker-php-ext-install pdo pdo_mysql