From 04bfc68b6b443a724365da0d0bd91f1aa065d572 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Mon, 17 Dec 2018 15:46:26 +0100 Subject: [PATCH] improved bashrc; changed volumes for file migration eg: d7.materio.com --- .env | 2 +- Docker/mysql/mysql.cnf | 10 ++++++++++ Docker/nginx/Dockerfile | 2 ++ Docker/nginx/bashrc | 3 +++ Docker/nginx/default.conf | 2 +- Docker/nginx/inputrc | 2 ++ Docker/php/Dockerfile | 3 +++ Docker/php/bashrc | 4 ++++ Docker/php/inputrc | 2 ++ docker-compose.yml | 9 ++++++--- public_html | 2 +- 11 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 Docker/nginx/bashrc create mode 100644 Docker/nginx/inputrc create mode 100644 Docker/php/bashrc create mode 100644 Docker/php/inputrc diff --git a/.env b/.env index 7767ac4..a2d858c 100644 --- a/.env +++ b/.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 diff --git a/Docker/mysql/mysql.cnf b/Docker/mysql/mysql.cnf index 8d6fb74..0553107 100644 --- a/Docker/mysql/mysql.cnf +++ b/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 diff --git a/Docker/nginx/Dockerfile b/Docker/nginx/Dockerfile index f1acc2d..aa3e544 100644 --- a/Docker/nginx/Dockerfile +++ b/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 diff --git a/Docker/nginx/bashrc b/Docker/nginx/bashrc new file mode 100644 index 0000000..74d78f9 --- /dev/null +++ b/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' diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf index f653d83..67a57b5 100644 --- a/Docker/nginx/default.conf +++ b/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; diff --git a/Docker/nginx/inputrc b/Docker/nginx/inputrc new file mode 100644 index 0000000..db8d91d --- /dev/null +++ b/Docker/nginx/inputrc @@ -0,0 +1,2 @@ +set show-all-if-ambiguous on +set completion-ignore-case on diff --git a/Docker/php/Dockerfile b/Docker/php/Dockerfile index ae71364..dcfddda 100644 --- a/Docker/php/Dockerfile +++ b/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 diff --git a/Docker/php/bashrc b/Docker/php/bashrc new file mode 100644 index 0000000..468610f --- /dev/null +++ b/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' diff --git a/Docker/php/inputrc b/Docker/php/inputrc new file mode 100644 index 0000000..db8d91d --- /dev/null +++ b/Docker/php/inputrc @@ -0,0 +1,2 @@ +set show-all-if-ambiguous on +set completion-ignore-case on diff --git a/docker-compose.yml b/docker-compose.yml index 531f60f..e8f2e8a 100644 --- a/docker-compose.yml +++ b/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: diff --git a/public_html b/public_html index e46a846..8679283 160000 --- a/public_html +++ b/public_html @@ -1 +1 @@ -Subproject commit e46a846e3923f055faf24ffd60f41022cfac3529 +Subproject commit 86792830fb927ce93b3a3e7eb97530c9ad2781f7