Browse Source

improved bashrc; changed volumes for file migration eg: d7.materio.com

Bachir Soussi Chiadmi 5 years ago
parent
commit
04bfc68b6b

+ 1 - 1
.env

@@ -1,7 +1,7 @@
 COMPOSE_PROJECT_NAME=materiod8
 
 PROJECT_ROOT=./public_html
-LEGACY_ROOT=./drupal7
+LEGACY_ROOT=../d7.materio.com/public_html
 LOG_ROOT=./log
 
 DB_IMPORTE_FILE_D8=./ressources/materio_d8.sql

+ 10 - 0
Docker/mysql/mysql.cnf

@@ -1,2 +1,12 @@
+[client]
+default-character-set=utf8
+
 [mysqld]
 max_allowed_packet=500M
+
+collation-server = utf8_unicode_ci
+init-connect='SET NAMES utf8'
+character-set-server = utf8
+
+[mysql]
+default-character-set=utf8

+ 2 - 0
Docker/nginx/Dockerfile

@@ -1,3 +1,5 @@
 FROM nginx:latest
 
 COPY ./default.conf /etc/nginx/conf.d/default.conf
+COPY ./bashrc /root/.bashrc
+COPY ./inputrc /root/.inputrc

+ 3 - 0
Docker/nginx/bashrc

@@ -0,0 +1,3 @@
+PS1='\e[36m\e[1mNGINX\e[0m:\e[90m\w\e[0m\n$ '
+bind '"\e[A": history-search-backward'
+bind '"\e[B": history-search-forward'

+ 1 - 1
Docker/nginx/default.conf

@@ -1,6 +1,6 @@
 server {
     listen 80 default_server;
-    root /var/www/html;
+    root /var/www/html/d8.materio.com/public_html;
     index index.html index.php;
     server_name *.materio.com;
 

+ 2 - 0
Docker/nginx/inputrc

@@ -0,0 +1,2 @@
+set show-all-if-ambiguous on
+set completion-ignore-case on

+ 3 - 0
Docker/php/Dockerfile

@@ -30,3 +30,6 @@ RUN export COMPOSER_HOME=/usr/local/composer && \
 			curl https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar \
 				-L -o /usr/local/bin/drush && \
 			chmod +x /usr/local/bin/drush
+
+COPY ./bashrc /root/.bashrc
+COPY ./inputrc /root/.inputrc

+ 4 - 0
Docker/php/bashrc

@@ -0,0 +1,4 @@
+
+PS1='\e[36m\e[1mPHP\e[0m:\e[90m\w\e[0m\n$ '
+bind '"\e[A": history-search-backward'
+bind '"\e[B": history-search-forward'

+ 2 - 0
Docker/php/inputrc

@@ -0,0 +1,2 @@
+set show-all-if-ambiguous on
+set completion-ignore-case on

+ 6 - 3
docker-compose.yml

@@ -46,8 +46,9 @@ services:
       - 9000
     volumes:
       - php-root-data:/root
-      - "${PROJECT_ROOT}:/var/www/html"
-      - "${LEGACY_ROOT}:/var/www/drupal6"
+      - "${PROJECT_ROOT}:/var/www/html/d8.materio.com/public_html"
+      - "${LEGACY_ROOT}:/var/www/html/d7.materio.com/public_html"
+    working_dir: "/var/www/html/d8.materio.com/public_html"
     networks:
       - database
       - redis
@@ -74,8 +75,10 @@ services:
     ports:
       - 8890:80
     volumes:
-      - "${PROJECT_ROOT}:/var/www/html"
+      - "${PROJECT_ROOT}:/var/www/html/d8.materio.com/public_html"
+      - "${LEGACY_ROOT}:/var/www/html/d7.materio.com/public_html"
       - "${LOG_ROOT}:/var/log:rw"
+    working_dir: "/var/www/html/d8.materio.com/public_html"
     networks:
       - server
     depends_on:

+ 1 - 1
public_html

@@ -1 +1 @@
-Subproject commit e46a846e3923f055faf24ffd60f41022cfac3529
+Subproject commit 86792830fb927ce93b3a3e7eb97530c9ad2781f7