Update

Thibaut-gauvin · Sep 28, 2017 · 4b38509 · 4b38509
1 parent 5795a44
commit 4b38509
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/06-development-env/docker-compose.yml b/06-development-env/docker-compose.yml
@@ -15,6 +15,7 @@ services:
     php:
         build:
             context: docker/
+            dockerfile: Dockerfile
         volumes:
             - "./src:/home/docker"
             - "./docker/php.ini:/usr/local/etc/php/conf.d/custom.ini:ro"
@@ -49,7 +50,7 @@ services:
         environment:
             - "PMA_HOST=db"
             - "PMA_USER=root"
-            - "PMA_PASSWORD=root"
+            - "PMA_PASSWORD=${MYSQL_ROOT_PASSWORD}"
 
 networks:
     demo_meetup:

diff --git a/06-development-env/docker/Dockerfile b/06-development-env/docker/Dockerfile
@@ -11,6 +11,6 @@ RUN docker-php-ext-install \
         mysqli \
         pdo_mysql
 
-# Install xdebug extention
-RUN pecl install xdebug \
-    && docker-php-ext-enable xdebug
+## Install xdebug extention
+#RUN pecl install xdebug \
+#    && docker-php-ext-enable xdebug