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

fixed pma, changed ports

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi 2021-03-22 11:49:08 +01:00
parent 6ddcc650ab
commit 5f5e0e8404
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -54,8 +54,8 @@ configure your apache vhosts to add a reverse proxy that will redirect the dev.m
```apache ```apache
<Virtualhost *:80> <Virtualhost *:80>
ServerName dev.d7.popsu.archi.fr ServerName dev.d7.popsu.archi.fr
ProxyPass / http://127.0.0.1:8880/ ProxyPass / http://127.0.0.1:8980/
ProxyPassReverse / http://127.0.0.1:8880/ ProxyPassReverse / http://127.0.0.1:8980/
ProxyRequests Off ProxyRequests Off
ProxyPreserveHost On ProxyPreserveHost On
proxy_buffer_size 128k; proxy_buffer_size 128k;
@ -64,8 +64,8 @@ configure your apache vhosts to add a reverse proxy that will redirect the dev.m
</Virtualhost> </Virtualhost>
<Virtualhost *:80> <Virtualhost *:80>
ServerName dev.d9.popsu.archi.fr ServerName dev.d9.popsu.archi.fr
ProxyPass / http://127.0.0.1:8880/ ProxyPass / http://127.0.0.1:8980/
ProxyPassReverse / http://127.0.0.1:8880/ ProxyPassReverse / http://127.0.0.1:8980/
ProxyRequests Off ProxyRequests Off
ProxyPreserveHost On ProxyPreserveHost On
proxy_buffer_size 128k; proxy_buffer_size 128k;
@ -74,8 +74,8 @@ configure your apache vhosts to add a reverse proxy that will redirect the dev.m
</Virtualhost> </Virtualhost>
<Virtualhost *:80> <Virtualhost *:80>
ServerName dev.phpmyadmin.popsu.archi.fr ServerName dev.phpmyadmin.popsu.archi.fr
ProxyPass / http://127.0.0.1:8881/ ProxyPass / http://127.0.0.1:8981/
ProxyPassReverse / http://127.0.0.1:8881/ ProxyPassReverse / http://127.0.0.1:8981/
ProxyRequests Off ProxyRequests Off
ProxyPreserveHost On ProxyPreserveHost On
proxy_buffer_size 128k; proxy_buffer_size 128k;
@ -95,7 +95,7 @@ server {
client_max_body_size 100m; client_max_body_size 100m;
location / { location / {
proxy_pass http://127.0.0.1:8880; proxy_pass http://127.0.0.1:8980;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@ -110,7 +110,7 @@ server {
server_name dev.phpmyadmin.popsu.archi.fr; server_name dev.phpmyadmin.popsu.archi.fr;
location / { location / {
proxy_pass http://127.0.0.1:8881; proxy_pass http://127.0.0.1:8981;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

11
docker-compose.yml
View File

@ -40,8 +40,6 @@ services:
php_d7: php_d7:
build: ./Docker/php-5.6-fpm/ build: ./Docker/php-5.6-fpm/
# expose:
# - 9000
volumes: volumes:
- php-d7-user-data:/home/${USER_UNAME} - php-d7-user-data:/home/${USER_UNAME}
- "${PROJECT_ROOT_D7}:/var/www/d7" - "${PROJECT_ROOT_D7}:/var/www/d7"
@ -56,8 +54,6 @@ services:
php_d9: php_d9:
build: ./Docker/php-7.3-fpm/ build: ./Docker/php-7.3-fpm/
# expose:
# - 8999
user: ${USER_UID}:${USER_GID} user: ${USER_UID}:${USER_GID}
volumes: volumes:
- php-d9-user-data:/home/${USER_UNAME} - php-d9-user-data:/home/${USER_UNAME}
@ -76,19 +72,20 @@ services:
phpmyadmin: phpmyadmin:
image: phpmyadmin/phpmyadmin image: phpmyadmin/phpmyadmin
ports: ports:
- 8881:80 - 8981:80
networks: networks:
- database - database
depends_on: depends_on:
- mysql_d7 - mysql_d7
- mysql_d9 - mysql_d9
environment: environment:
PMA_HOST: mysql_d7, mysql_d9 PMA_HOSTS: mysql_d7,mysql_d9
nginx: nginx:
build: ./Docker/nginx/ build: ./Docker/nginx/
ports: ports:
- 8880:80 - 8980:80
working_dir: "/var/www" working_dir: "/var/www"
volumes: volumes:
- "${PROJECT_ROOT_D7}:/var/www/d7" - "${PROJECT_ROOT_D7}:/var/www/d7"