bachir/docker-popsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed d7 containers

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi 2025-04-11 10:04:02 +02:00
parent 5ff1cd63d2
commit 2106517adb
4 changed files with 73 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Docker/nginx/default.conf
View File

@ -1,40 +1,40 @@
server {
listen 80;
root /var/www/d7;
index index.html index.php;
server_name dev.d7.popsu.archi.fr;
# server {
# listen 80;
# root /var/www/d7;
# index index.html index.php;
# server_name dev.d7.popsu.archi.fr;
charset utf-8;
# charset utf-8;
location / {
try_files $uri $uri/ /index.php?$query_string;
}
# location / {
# try_files $uri $uri/ /index.php?$query_string;
# }
location = /favicon.ico { access_log off; log_not_found off; }
location = /robots.txt { access_log off; log_not_found off; }
# location = /favicon.ico { access_log off; log_not_found off; }
# location = /robots.txt { access_log off; log_not_found off; }
access_log on;
error_log /var/log/nginx/error-d7.log error;
# access_log on;
# error_log /var/log/nginx/error-d7.log error;
sendfile off;
# sendfile off;
client_max_body_size 100m;
# client_max_body_size 100m;
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass php_d7:9000;
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_intercept_errors off;
fastcgi_buffer_size 16k;
fastcgi_buffers 4 16k;
}
# location ~ \.php$ {
# fastcgi_split_path_info ^(.+\.php)(/.+)$;
# fastcgi_pass php_d7:9000;
# fastcgi_index index.php;
# include fastcgi_params;
# fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
# fastcgi_intercept_errors off;
# fastcgi_buffer_size 16k;
# fastcgi_buffers 4 16k;
# }
location ~ /\.ht {
deny all;
}
}
# location ~ /\.ht {
# deny all;
# }
# }
server {
listen 80;

6
Docker/php-8.1-fpm/Dockerfile
View File

@ -7,6 +7,8 @@ RUN apt-get update && apt-get install -y \
libpng-dev \
mariadb-client \
zip \
iputils-ping \
iproute2 \
libzip-dev && \
# docker-php-ext-install -j$(nproc) iconv && \
docker-php-ext-configure gd --with-freetype --with-jpeg && \
@ -22,8 +24,8 @@ RUN apt-get install -y git vim
RUN pecl install redis-5.3.3 && \
docker-php-ext-enable redis
RUN pecl install xdebug-3.2.1 && \
docker-php-ext-enable redis xdebug
RUN pecl install xdebug-3.3.1 && \
docker-php-ext-enable xdebug
RUN export COMPOSER_HOME=/usr/local/composer && \
curl -sS https://getcomposer.org/installer \

14
Makefile
View File

@ -73,20 +73,20 @@ down:
exec_nginx:
docker exec -it popsu-nginx-1 bash
exec_php_d7:
docker exec -it popsu-php_d7-1 bash
# exec_php_d7:
# docker exec -it popsu-php_d7-1 bash
exec_php_d9:
docker exec -it popsu-php_d9-1 bash
exec_mysql_d7:
docker exec -it popsu-mysql_d7-1 bash
# exec_mysql_d7:
# docker exec -it popsu-mysql_d7-1 bash
exec_mysql_d9:
docker exec -it popsu-mysql_d9-1 bash
dump_d7_db:
docker exec popsu-mysql_d7-1 sh -c 'exec mysqldump -uroot -ppopsu popsu-d7' > ./ressources/popsu-d7-$(DATE_NOW)-local.sql
# dump_d7_db:
# docker exec popsu-mysql_d7-1 sh -c 'exec mariadb-dump -uroot -ppopsu popsu-d7' > ./ressources/popsu-d7-$(DATE_NOW)-local.sql
dump_d9_db:
docker exec popsu-mysql_d9-1 sh -c 'exec mysqldump -uroot -ppopsu popsu_d9' > ./ressources/popsu-d9-$(DATE_NOW)-local.sql
docker exec popsu-mysql_d9-1 sh -c 'exec mariadb-dump -uroot -ppopsu popsu_d9' > ./ressources/popsu-d9-$(DATE_NOW)-local.sql

66
docker-compose.yml
View File

@ -1,19 +1,19 @@
version: "3.5"
services:
mysql_d7:
image: mariadb:latest
volumes:
- db-data-d7:/var/lib/mysql
- ./Docker/mysql/mysql.cnf:/etc/mysql/conf.d/custom.cnf:ro
- "${DB_IMPORTE_FILE_D7}:/docker-entrypoint-initdb.d/popsu_d7.sql"
networks:
- database
environment:
MYSQL_ROOT_PASSWORD: "${DB_ROOT_PASSWORD}"
MYSQL_DATABASE: "${DB_NAME_D7}"
MYSQL_USER: "${DB_USERNAME}"
MYSQL_PASSWORD: "${DB_PASSWORD}"
# mysql_d7:
# image: mariadb:latest
# volumes:
# - db-data-d7:/var/lib/mysql
# - ./Docker/mysql/mysql.cnf:/etc/mysql/conf.d/custom.cnf:ro
# - "${DB_IMPORTE_FILE_D7}:/docker-entrypoint-initdb.d/popsu_d7.sql"
# networks:
# - database
# environment:
# MYSQL_ROOT_PASSWORD: "${DB_ROOT_PASSWORD}"
# MYSQL_DATABASE: "${DB_NAME_D7}"
# MYSQL_USER: "${DB_USERNAME}"
# MYSQL_PASSWORD: "${DB_PASSWORD}"
mysql_d9:
image: mariadb:latest
@ -38,19 +38,19 @@ services:
ports:
- "6379"
php_d7:
build: ./Docker/php-5.6-fpm/
volumes:
- php-d7-user-data:/home/${USER_UNAME}
- "${PROJECT_ROOT_D7}:/var/www/d7"
working_dir: "/var/www/d7"
networks:
- database
- server
- redis
depends_on:
- mysql_d7
- redis
# php_d7:
# build: ./Docker/php-5.6-fpm/
# volumes:
# - php-d7-user-data:/home/${USER_UNAME}
# - "${PROJECT_ROOT_D7}:/var/www/d7"
# working_dir: "/var/www/d7"
# networks:
# - database
# - server
# - redis
# depends_on:
# - mysql_d7
# - redis
php_d9:
build: ./Docker/php-8.1-fpm/
@ -69,7 +69,7 @@ services:
# for xdebug
# https://github.com/docker/for-linux/issues/264#issuecomment-965465879
extra_hosts:
- host.docker.internal:host-gateway
- "host.docker.internal:host-gateway"
depends_on:
- mysql_d9
- redis
@ -81,10 +81,10 @@ services:
networks:
- database
depends_on:
- mysql_d7
# - mysql_d7
- mysql_d9
environment:
PMA_HOSTS: mysql_d7,mysql_d9
PMA_HOSTS: mysql_d9 #mysql_d7,
nginx:
@ -93,20 +93,20 @@ services:
- 8980:80
working_dir: "/var/www"
volumes:
- "${PROJECT_ROOT_D7}:/var/www/d7"
# - "${PROJECT_ROOT_D7}:/var/www/d7"
- "${PROJECT_ROOT_D9}:/var/www/d9"
- "${LOG_ROOT}:/var/log:rw"
networks:
- server
depends_on:
- php_d7
# - php_d7
- php_d9
volumes:
db-data-d7:
# db-data-d7:
db-data-d9:
redis-data:
php-d7-user-data:
# php-d7-user-data:
php-d9-user-data:
networks: