added drush to php image + gd + php-custom.ini, updated readme for reverse proxy with apache

README.md

@@ -2,8 +2,21 @@
 # MateriO 7.x
 MateriO Base powered by druapl 7 docker environement
 
-# steps
+# reverse proxy
-<!-- copy env.example to .env and edit the values to match your env -->
+```
+<Virtualhost *:80>
+   ServerName dev.materio.com
+   ServerAlias dev.sb.materio.com
+   ServerAlias dev.materio.eu
+   ServerAlias dev.materio.fr
+   ServerAlias dev.materio.net
+
+   ProxyPass / http://127.0.0.1:81/
+   ProxyPassReverse / http://127.0.0.1:81/
+   ProxyRequests Off
+</Virtualhost>
+
+```
 
 # sources
 https://www.ostraining.com/blog/drupal/docker/
@@ -11,3 +24,5 @@ https://www.ostraining.com/blog/drupal/docker/
 http://tech.osteel.me/posts/2017/01/15/how-to-use-docker-for-local-web-development-an-update.html
 
 https://mmenozzi.github.io/2016/01/22/php-web-development-with-docker/
+
+https://dzone.com/articles/continuous-drupal-maintaining-a-drupal-website-wit

docker-compose.yml

@@ -1,41 +1,52 @@
 version: "3.5"
 
 services:
-    nginx:
+  mysql:
-        build: ./nginx/
+    image: mariadb:latest
-        ports:
+    volumes:
-            - 81:80
+      - data:/var/lib/mysql
-        volumes:
+    networks:
-            - "${PROJECT_ROOT}:/var/www/html"
+      - database
-            - "${LOG_ROOT}:/var/log:rw"
+    environment:
-        networks:
+      MYSQL_ROOT_PASSWORD: "${DB_ROOT_PASSWORD}"
-            - server
+      MYSQL_DATABASE: "${DB_NAME}"
-        depends_on:
+      MYSQL_USER: "${DB_USERNAME}"
-            - php
+      MYSQL_PASSWORD: "${DB_PASSWORD}"
 
-    php:
+  php:
-        build: ./php/
+    build: ./php/
-        expose:
+    expose:
-            - 9000
+      - 9000
-        volumes:
+    volumes:
-            - "${PROJECT_ROOT}:/var/www/html"
+      - "${PROJECT_ROOT}:/var/www/html"
-        networks:
+    networks:
-            - database
+      - database
-            - server
+      - server
-        depends_on:
+    depends_on:
-            - mysql
+      - mysql
 
-    mysql:
+  phpmyadmin:
-        image: mariadb:latest
+    image: phpmyadmin/phpmyadmin
-        volumes:
+    ports:
-            - data:/var/lib/mysql
+      - 8080:80
-        networks:
+    networks:
-            - database
+      - database
-        environment:
+    depends_on:
-            MYSQL_ROOT_PASSWORD: "${DB_ROOT_PASSWORD}"
+      - mysql
-            MYSQL_DATABASE: "${DB_NAME}"
+    environment:
-            MYSQL_USER: "${DB_USERNAME}"
+      PMA_HOST: mysql
-            MYSQL_PASSWORD: "${DB_PASSWORD}"
+
+  nginx:
+    build: ./nginx/
+    ports:
+      - 81:80
+    volumes:
+      - "${PROJECT_ROOT}:/var/www/html"
+      - "${LOG_ROOT}:/var/log:rw"
+    networks:
+      - server
+    depends_on:
+      - php
 
 volumes:
     data:

php/Dockerfile

@@ -1,3 +1,23 @@
 FROM php:5.6-fpm
 
-RUN docker-php-ext-install pdo_mysql
+COPY ./php-custom.ini /usr/local/etc/php/conf.d/php-custom.ini
+
+RUN apt-get update && apt-get install -y \
+		libfreetype6-dev \
+		libjpeg62-turbo-dev \
+    libmcrypt-dev \
+		libpng-dev \
+    zip \
+	&& docker-php-ext-install -j$(nproc) iconv mcrypt \
+	&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+	&& docker-php-ext-install -j$(nproc) gd
+
+RUN docker-php-ext-install pdo_mysql zip
+
+RUN apt-get install -y git vim
+
+RUN export COMPOSER_HOME=/usr/local/composer && \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
+    composer global require drush/drush:6.5.0 && \
+    composer global install && \
+    ln -s /usr/local/composer/vendor/drush/drush/drush /usr/local/bin/drush

php/php-custom.ini

@@ -0,0 +1 @@
+memory_limit = 526M