release candidat

Docker/php/Dockerfile

@@ -7,17 +7,14 @@ RUN apt-get update && apt-get install -y \
 		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
+    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 && \
+		docker-php-ext-install pdo_mysql zip && \
+		apt-get install -y git vim && \
+		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

README.md

@@ -2,12 +2,12 @@
 # MateriO 7.x
 MateriO Base powered by druapl 7  in docker environement (nginx, php:5.6-fpm+drush, solr:5, phpmyadmin)
 
-# install docker
+## Install docker
 ```
 sudo pacman -S docker docker-compose docker-machine
 ```
 
-# clone this repos
+## Clone this repos
 
 this will clone this repos (main docker environement) and the materio-base drupal 7 source code (without sites/default folder)
 
@@ -15,18 +15,18 @@ this will clone this repos (main docker environement) and the materio-base drupa
 git clone --recursive -o figli https://figureslibres.io/gogs/bachir/docker-materio.git
 ```
 
-## setup /sites/default/settings.php
+### setup /sites/default/settings.php
 
 ```cp -r ressources/default public_html/sites/```
 
-## get the sites/default/files folder
+### get the sites/default/files folder
 get the files from where you have it and rsync it to public_html/sites/default/files/
 
-# Mysql
+## Mysql
 Copy your-sql-dump.sql into ./ressources/db.sql
 It will be automaticly imported into the mysql container db (only) on the first docker-compose up
 
-# hosts and reverse proxy
+## Hosts and reverse proxy
 
 add to your /etc/hosts :
 ```
@@ -37,43 +37,56 @@ configure your apache vhosts to add a reverse proxy that will redirect the dev.m
 ```
 <Virtualhost *:80>
    ServerName dev.materio.com
-   ProxyPass / http://127.0.0.1:81/
-   ProxyPassReverse / http://127.0.0.1:81/
+   ProxyPass / http://127.0.0.1:8880/
+   ProxyPassReverse / http://127.0.0.1:8880/
    ProxyRequests Off
 </Virtualhost>
 ```
 ```
 <Virtualhost *:80>
    ServerName dev.phpmyadmin.materio.com
-   ProxyPass / http://127.0.0.1:8080/
-   ProxyPassReverse / http://127.0.0.1:8080/
+   ProxyPass / http://127.0.0.1:8881/
+   ProxyPassReverse / http://127.0.0.1:8881/
    ProxyRequests Off
 </Virtualhost>
 ```
-#Docker
+## Docker
 
-## build
+### build
 only before the first run (may take some time)
 ```
 sudo docker-compose build
 ```
-## run
+### run
 then each time you want to launch the app
 ```
 sudo docker-compose up -d
 ```
-# Visualize
-you can now visit http://dev.materio.com on your browser
+Be aware that a first up, since the db is empty, it will be populated with your file db.sql. It may take some time depending of your db size.
 
-# Coding
-## drush
+### solr
+At first run solr index will be empty, you should login into materio_php_1 and index all the content.
+```
+sudo docker exec -it materiod7_php_1 bash
+```
+once inside materio_php_1 run
+```
+drush sapi-i
+```
+
+## Visualize
+You can now visit http://dev.materio.com on your browser
+After the first run
+
+## Coding
+### drush
 you can access to drush by loging into the php container
 ```
-sudo docker exec -it materio_php_1 bash
+sudo docker exec -it materiod7_php_1 bash
 ```
 once inside the php container in /var/www/html you can use drush as usual
 
-## gulp
+### gulp
 Dev process needs gulp to run in: 
 - public_html/sites/all/modules/gui/materiobasemod/
 - public_html/sites/all/themes/gui/materiobasetheme/ 
@@ -86,11 +99,11 @@ gulp
 ## updateding manualy mysql db
 copy your db backup into the mysql container
 ```
-sudo docker cp your-db-file.sql materio_mysql_1:/root/
+sudo docker cp your-db-file.sql materiod7_mysql_1:/root/
 ```
 log into mysql container
 ```
-sudo docker exec -it materio_php_1 bash
+sudo docker exec -it materiod7_php_1 bash
 ```
 once inside the mysql container you can use mysql command to drop then create and load the db with your file
 

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     image: mariadb:latest
     volumes:
       - db-data:/var/lib/mysql
-      - "${DB_IMPORTE_FILE}":/docker-entrypoint-initdb.d/db.sql
+      - "${DB_IMPORTE_FILE}:/docker-entrypoint-initdb.d/db.sql"
     networks:
       - database
     environment:
@@ -40,7 +40,7 @@ services:
   phpmyadmin:
     image: phpmyadmin/phpmyadmin
     ports:
-      - 8080:80
+      - 8881:80
     networks:
       - database
     depends_on:
@@ -51,7 +51,7 @@ services:
   nginx:
     build: ./Docker/nginx/
     ports:
-      - 81:80
+      - 8880:80
     volumes:
       - "${PROJECT_ROOT}:/var/www/html"
       - "${LOG_ROOT}:/var/log:rw"