5282: Updated docker compose setup

Author: rimi-itk

.docker/nginx.conf

@@ -7,7 +7,6 @@ events {
     worker_connections  1024;
 }
 
-
 http {
     proxy_temp_path /tmp/proxy_temp;
     client_body_temp_path /tmp/client_temp;
@@ -18,7 +17,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    set_real_ip_from 172.16.0.0/8;
+    set_real_ip_from 172.16.0.0/16;
     real_ip_recursive on;
     real_ip_header X-Forwarded-For;
 

.docker/templates/default.conf.template

@@ -4,12 +4,14 @@ server {
 
     root ${NGINX_WEB_ROOT};
 
-    ___location / {
-        # We are co-hosting with the legacy EventDB, so this app is hosted under '/api/v2/' (.env::APP_PATH_PREFIX)
-        # This is configured for Symfony in both 'api_platform.prefix' and 'framework.assets.base_path'. However
-        # Symfony still installs assets in the root path so we need to rewrite the uri to remove '/api/v2/'.
-        rewrite ^${APP_PATH_PREFIX}/(.*) /$1 break;
+    client_max_body_size ${NGINX_MAX_BODY_SIZE};
+
+    # This also needs to be set in the single server tag and not only in http.
+    set_real_ip_from 172.16.0.0/16;
+    real_ip_recursive on;
+    real_ip_header X-Forwarded-For;
 
+    ___location / {
         # try to serve file directly, fallback to index.php
         try_files $uri /index.php$is_args$args;
     }

docker-compose.dev.yml

@@ -1,4 +1,4 @@
-# itk-version: 3.2.3
+# itk-version: 3.2.4
 services:
   phpfpm:
     environment:

docker-compose.override.yml

@@ -22,6 +22,9 @@ services:
     environment:
       APP_PATH_PREFIX: ${APP_PATH_PREFIX}
     labels:
+      # HTTPS config - uncomment to enable redirect from :80 to :443
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.middlewares=redirect-to-https"
+      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
       # Scope hosting by path prefix to allow shared hosting with legacy EventDB
       # 'https://api.detskeriaarhus.dk/api/' -> Legacy EventDB
       # 'https://api.detskeriaarhus.dk/api/v2/' -> EventDB v2

docker-compose.redirect.yml

@@ -1,4 +1,4 @@
-# itk-version: 3.2.3
+# itk-version: 3.2.4
 services:
   nginx:
     labels:

docker-compose.server.yml

@@ -1,4 +1,4 @@
-# itk-version: 3.2.3
+# itk-version: 3.2.4
 networks:
   frontend:
     external: true

docker-compose.yml

@@ -1,4 +1,4 @@
-# itk-version: 3.2.3
+# itk-version: 3.2.4
 networks:
   frontend:
     external: true
@@ -85,3 +85,22 @@ services:
       - "traefik.docker.network=frontend"
       - "traefik.http.routers.${COMPOSE_PROJECT_NAME}mail.rule=Host(`mail-${COMPOSE_DOMAIN}`)"
       - "traefik.http.services.${COMPOSE_PROJECT_NAME}mail.loadbalancer.server.port=8025"
+
+  # Code checks tools
+  markdownlint:
+    image: itkdev/markdownlint
+    profiles:
+      - dev
+    volumes:
+      - ./:/md
+
+  prettier:
+    # Prettier does not (yet, fcf.
+    # https://github.com/prettier/prettier/issues/15206) have an official
+    # docker image.
+    # https://hub.docker.com/r/jauderho/prettier is good candidate (cf. https://hub.docker.com/search?q=prettier&sort=updated_at&order=desc)
+    image: jauderho/prettier
+    profiles:
+      - dev
+    volumes:
+      - ./:/work