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

This commit is contained in:
Bachir Soussi Chiadmi 2018-12-17 15:46:26 +01:00
parent 1b7efa8c25
commit 04bfc68b6b
11 changed files with 35 additions and 6 deletions

2
.env
View File

@ -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

View File

@ -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

View File

@ -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
Docker/nginx/bashrc Normal file
View File

@ -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'

View File

@ -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
Docker/nginx/inputrc Normal file
View File

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

View File

@ -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
Docker/php/bashrc Normal file
View File

@ -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
Docker/php/inputrc Normal file
View File

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

View File

@ -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 @@
Subproject commit e46a846e3923f055faf24ffd60f41022cfac3529
Subproject commit 86792830fb927ce93b3a3e7eb97530c9ad2781f7