diff --git a/.env b/.env index 76c4110..59daf03 100644 --- a/.env +++ b/.env @@ -1,8 +1,9 @@ COMPOSE_PROJECT_NAME=materiod7 -PROJECT_ROOT=./base_d7 +PROJECT_ROOT=./public_html LOG_ROOT=./log +DB_IMPORTE_FILE=./ressources/db.sql DB_ROOT_PASSWORD=materio DB_NAME=materio_base_d7 DB_USERNAME=materio diff --git a/README.md b/README.md index 9ab476d..5a1a856 100644 --- a/README.md +++ b/README.md @@ -8,25 +8,32 @@ sudo pacman -S docker docker-compose docker-machine ``` # clone this repos + +this will clone this repos (main docker environement) and the materio-base drupal 7 source code (without sites/default folder) + ``` -git clone -o figli https://figureslibres.io/gogs/bachir/docker-materio.git +git clone --recursive -o figli https://figureslibres.io/gogs/bachir/docker-materio.git ``` -# clone drupal 7 materio base -``` -cd docker-materio -git clone -o figli https://figureslibres.io/gogs/bachir/materio-base-d7.git base_d7 -``` -or with submodule - -## get the sites/default contents ## setup /sites/default/settings.php -# Mysql -copy your-sql-dump.sql into ./ressources/materio_base_d7.sql -it will be automaticly imported into the mysql container db (only the first time) +```cp -r ressources/default public_html/sites/``` -# reverse proxy +## get the sites/default/files folder +get the files from where you have it and rsync it to public_html/sites/default/files/ + +# 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 + +add to your /etc/hosts : +``` +127.0.0.1 dev.materio.com +127.0.0.1 dev.phpmyadmin.materio.com +``` +configure your apache vhosts to add a reverse proxy that will redirect the dev.materio.com to our container ``` ServerName dev.materio.com @@ -43,25 +50,40 @@ it will be automaticly imported into the mysql container db (only the first time ProxyRequests Off ``` +#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 run -d +sudo docker-compose up -d ``` +# Visualize +you can now visit http://dev.materio.com on your browser -# drush -log into php container +# Coding +## drush +you can access to drush by loging into the php container ``` sudo docker exec -it materio_php_1 bash ``` once inside the php container in /var/www/html you can use drush as usual -# updateding manualy mysql db +## gulp +Dev process needs gulp to run in: +- public_html/sites/all/modules/gui/materiobasemod/ +- public_html/sites/all/themes/gui/materiobasetheme/ +if you have to modifie js or scss source code, you need to do in each of these 2 folder: +``` +npm install +gulp +``` + +## updateding manualy mysql db copy your db backup into the mysql container ``` sudo docker cp your-db-file.sql materio_mysql_1:/root/ diff --git a/docker-compose.yml b/docker-compose.yml index 352b5fd..0840e2c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: image: mariadb:latest volumes: - db-data:/var/lib/mysql - - ./ressources/db.sql:/docker-entrypoint-initdb.d/db.sql + - "${DB_IMPORTE_FILE}":/docker-entrypoint-initdb.d/db.sql networks: - database environment: