wip

compose.yml

@@ -1,57 +1,52 @@
 services:
+  haproxy:
+    image: haproxy:2.6.22
+    volumes:
+      - ./misc/compose/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
+    ports:
+      - 10500:10500
+      - 10501:10501
+      # - 10502:10502
+      - 10503:10503
   hydra-sql:
     build:
       context: .
-      dockerfile: ./misc/images/hydra-sql-standalone/Dockerfile
+      dockerfile: ./misc/images/hydra-sql-dev/Dockerfile
       args:
-        - BASE_PATH=
-        - APP_ENV=dev
-        - ENCORE_MODE=dev
-        - HTTP_PROXY=${HTTP_PROXY}
-        - HTTPS_PROXY=${HTTPS_PROXY}
-        - http_proxy=${http_proxy}
-        - https_proxy=${https_proxy}
-    ports:
-      - 8082:8071
-    tmpfs:
-      - /var/www/var/logs:uid=${FIXUID:-1000},gid=${FIXGID:-1000}
-      - /var/www/var/cache:uid=${FIXUID:-1000},gid=${FIXGID:-1000}
-      - /var/www/public/build:uid=${FIXUID:-1000},gid=${FIXGID:-1000}
-      - /tmp
+        - SERVER_NAME=http://localhost:10500
     links:
       - hydra
     depends_on:
       - redis
-    extra_hosts:
-      - "localhost:127.0.0.1"
-      - "localhost:host-gateway"
-      - "host.docker.internal:host-gateway"
-    develop:
-      watch:
-        - action: rebuild
-          path: ./misc/images/hydra-sql-standalone
-        - action: rebuild
-          path: ./assets
-        - action: sync
-          path: ./templates
-          target: /app/templates
-        - action: sync
-          path: ./translations
-          target: /app/translations
-        - action: sync
-          path: ./config
-          target: /app/config
-        - action: sync
-          path: ./src
-          target: /app/src
+    tty: true
+    # develop:
+    #   watch:
+    #     - action: rebuild
+    #       path: ./misc/images/hydra-sql-standalone
+    #     - action: rebuild
+    #       path: ./assets
+    #     - action: sync
+    #       path: ./templates
+    #       target: /app/templates
+    #     - action: sync
+    #       path: ./translations
+    #       target: /app/translations
+    #     - action: sync
+    #       path: ./config
+    #       target: /app/config
+    #     - action: sync
+    #       path: ./src
+    #       target: /app/src
     environment:
+      - SERVER_NAME=http://localhost:10500
       - APP_ENV=dev
+      - APP_DEBUG=true
       - PHP_FPM_MEMORY_LIMIT=128m
       - APP_LOCALES=fr,en
       - HYDRA_ADMIN_BASE_URL=http://hydra:4445
       - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR,localhost
-      - ISSUER_URL=http://localhost:8000
-      - BASE_URL=http://localhost:8082
+      - ISSUER_URL=http://localhost:10502
+      - BASE_URL=http://localhost:10500
       - DB_USER=lasql
       - DB_PASSWORD=lasql
       - DEFAULT_LOCALE=fr
@@ -64,12 +59,12 @@ services:
     image: bornholm/oidc-test:v0.0.0-1-g936a77e
     environment:
       - LOG_LEVEL=0
-      - HTTP_ADDRESS=0.0.0.0:8000
+      - HTTP_ADDRESS=0.0.0.0:10502
       - OIDC_CLIENT_ID=oidc-test
       - OIDC_CLIENT_SECRET=oidc-test-123456
-      - OIDC_ISSUER_URL=http://localhost:8081/
-      - OIDC_REDIRECT_URL=http://localhost:8000
-      - OIDC_POST_LOGOUT_REDIRECT_URL=http://localhost:8000
+      - OIDC_ISSUER_URL=http://localhost:10501/
+      - OIDC_REDIRECT_URL=http://localhost:10502
+      - OIDC_POST_LOGOUT_REDIRECT_URL=http://localhost:10502
     depends_on:
       hydra:
         condition: service_healthy
@@ -83,20 +78,15 @@ services:
     environment:
       - LOG_LEAK_SENSITIVE_VALUES=true
       - HYDRA_ALLOW_INSECURE=yes
-      - HYDRA_URLS_SELF_ISSUER=http://localhost:8081/
-      - HYDRA_URLS_LOGOUT=http://localhost:8082/logout
-      - HYDRA_URLS_LOGIN=http://localhost:8082/
-      - HYDRA_URLS_CONSENT=http://localhost:8082/connect/consent
-      - HYDRA_URLS_ERROR=http://localhost:8082/error
+      - HYDRA_URLS_SELF_ISSUER=http://localhost:10501/
+      - HYDRA_URLS_LOGOUT=http://localhost:10500/logout
+      - HYDRA_URLS_LOGIN=http://localhost:10500/
+      - HYDRA_URLS_CONSENT=http://localhost:10500/connect/consent
+      - HYDRA_URLS_ERROR=http://localhost:10500/error
       - HYDRA_LEVEL=debug
       - HYDRA_DSN=postgres://lasql:lasql@postgres:5432/hydra
       - HYDRA_WAIT4X_DATABASE_DSN=postgres://lasql:lasql@postgres:5432/hydra?sslmode=disable
       - HYDRA_WAIT4X_DATABASE_TYPE=postgresql
-
-    ports:
-      - 8081:4444
-    links:
-      - postgres
     healthcheck:
       test:
         [
@@ -126,8 +116,8 @@ services:
 
   pgadmin:
     image: dpage/pgadmin4
-    ports:
-      - 8085:80
+    # ports:
+    #   - 10503:80
     restart: always
     environment:
       PGADMIN_DEFAULT_EMAIL: admin@admin.com