Browse Source

fixed pma, changed ports

bach 3 years ago
parent
commit
5f5e0e8404
2 changed files with 12 additions and 15 deletions
  1. 8 8
      README.md
  2. 4 7
      docker-compose.yml

+ 8 - 8
README.md

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

+ 4 - 7
docker-compose.yml

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