From 89250039b66d641121c557c8a3c46c2940b6d9b7 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Thu, 26 Jun 2025 19:00:15 +0200 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=93=9D(compose)=20Update=20deprecated?= =?UTF-8?q?=20USER=5FOIDC=5FFIELD*=20variables=20in=20example?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Luca Weiss --- env.d/production.dist/backend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/env.d/production.dist/backend b/env.d/production.dist/backend index e70f2c1103..c4f70f8611 100644 --- a/env.d/production.dist/backend +++ b/env.d/production.dist/backend @@ -43,8 +43,8 @@ OIDC_RP_CLIENT_ID= OIDC_RP_CLIENT_SECRET= OIDC_RP_SIGN_ALGO=RS256 OIDC_RP_SCOPES="openid email" -#USER_OIDC_FIELD_TO_SHORTNAME -#USER_OIDC_FIELDS_TO_FULLNAME +#OIDC_USERINFO_SHORTNAME_FIELD +#OIDC_USERINFO_FULLNAME_FIELDS LOGIN_REDIRECT_URL=https://${DOCS_HOST} LOGIN_REDIRECT_URL_FAILURE=https://${DOCS_HOST} From f8e7f53ef12b8415813d881691644a63b8f934ad Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Thu, 26 Jun 2025 19:09:01 +0200 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=93=9D(compose)=20Reindent=20compose.?= =?UTF-8?q?yaml=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow yamlllint's suggestions and use the correct indentation for lists. Signed-off-by: Luca Weiss --- docs/examples/compose/compose.yaml | 30 +++++++++---------- docs/examples/compose/keycloak/compose.yaml | 12 ++++---- docs/examples/compose/minio/compose.yaml | 10 +++---- .../examples/compose/nginx-proxy/compose.yaml | 24 +++++++-------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/docs/examples/compose/compose.yaml b/docs/examples/compose/compose.yaml index c44dcb50e5..6a813299a0 100644 --- a/docs/examples/compose/compose.yaml +++ b/docs/examples/compose/compose.yaml @@ -7,12 +7,12 @@ services: timeout: 2s retries: 300 env_file: - - env.d/postgresql - - env.d/common + - env.d/postgresql + - env.d/common environment: - - PGDATA=/var/lib/postgresql/data/pgdata + - PGDATA=/var/lib/postgresql/data/pgdata volumes: - - ./data/databases/backend:/var/lib/postgresql/data/pgdata + - ./data/databases/backend:/var/lib/postgresql/data/pgdata redis: image: redis:8 @@ -22,12 +22,12 @@ services: user: ${DOCKER_USER:-1000} restart: always environment: - - DJANGO_CONFIGURATION=Production + - DJANGO_CONFIGURATION=Production env_file: - - env.d/common - - env.d/backend - - env.d/yprovider - - env.d/postgresql + - env.d/common + - env.d/backend + - env.d/yprovider + - env.d/postgresql healthcheck: test: ["CMD", "python", "manage.py", "check"] interval: 15s @@ -45,24 +45,24 @@ services: image: lasuite/impress-y-provider:latest user: ${DOCKER_USER:-1000} env_file: - - env.d/common - - env.d/yprovider + - env.d/common + - env.d/yprovider frontend: image: lasuite/impress-frontend:latest user: "101" entrypoint: - - /docker-entrypoint.sh + - /docker-entrypoint.sh command: ["nginx", "-g", "daemon off;"] env_file: - - env.d/common + - env.d/common # Uncomment and set your values if using our nginx proxy example #environment: - # - VIRTUAL_HOST=${DOCS_HOST} # used by nginx proxy + # - VIRTUAL_HOST=${DOCS_HOST} # used by nginx proxy # - VIRTUAL_PORT=8083 # used by nginx proxy # - LETSENCRYPT_HOST=${DOCS_HOST} # used by lets encrypt to generate TLS certificate volumes: - - ./default.conf.template:/etc/nginx/templates/docs.conf.template + - ./default.conf.template:/etc/nginx/templates/docs.conf.template depends_on: backend: condition: service_healthy diff --git a/docs/examples/compose/keycloak/compose.yaml b/docs/examples/compose/keycloak/compose.yaml index 86ece3cecc..e271e3353e 100644 --- a/docs/examples/compose/keycloak/compose.yaml +++ b/docs/examples/compose/keycloak/compose.yaml @@ -7,19 +7,19 @@ services: timeout: 2s retries: 300 env_file: - - env.d/kc_postgresql + - env.d/kc_postgresql volumes: - - ./data/keycloak:/var/lib/postgresql/data/pgdata + - ./data/keycloak:/var/lib/postgresql/data/pgdata keycloak: image: quay.io/keycloak/keycloak:26.1.3 command: ["start"] env_file: - - env.d/kc_postgresql - - env.d/keycloak + - env.d/kc_postgresql + - env.d/keycloak # Uncomment and set your values if using our nginx proxy example # environment: - # - VIRTUAL_HOST=id.yourdomain.tld # used by nginx proxy + # - VIRTUAL_HOST=id.yourdomain.tld # used by nginx proxy # - VIRTUAL_PORT=8080 # used by nginx proxy # - LETSENCRYPT_HOST=id.yourdomain.tld # used by lets encrypt to generate TLS certificate depends_on: @@ -33,4 +33,4 @@ services: # #networks: # proxy-tier: -# external: true \ No newline at end of file +# external: true diff --git a/docs/examples/compose/minio/compose.yaml b/docs/examples/compose/minio/compose.yaml index edf1578665..2ec8beb269 100644 --- a/docs/examples/compose/minio/compose.yaml +++ b/docs/examples/compose/minio/compose.yaml @@ -2,8 +2,8 @@ services: minio: image: minio/minio environment: - - MINIO_ROOT_USER= - - MINIO_ROOT_PASSWORD= + - MINIO_ROOT_USER= + - MINIO_ROOT_PASSWORD= # Uncomment and set your values if using our nginx proxy example # - VIRTUAL_HOST=storage.yourdomain.tld # used by nginx proxy # - VIRTUAL_PORT=9000 # used by nginx proxy @@ -16,12 +16,12 @@ services: entrypoint: "" command: minio server /data volumes: - - ./data/minio:/data + - ./data/minio:/data # Uncomment if using our nginx proxy example # networks: -# - proxy-tier +# - proxy-tier # Uncomment if using our nginx proxy example #networks: # proxy-tier: -# external: true \ No newline at end of file +# external: true diff --git a/docs/examples/compose/nginx-proxy/compose.yaml b/docs/examples/compose/nginx-proxy/compose.yaml index f582f14502..0dbcf1d8f3 100644 --- a/docs/examples/compose/nginx-proxy/compose.yaml +++ b/docs/examples/compose/nginx-proxy/compose.yaml @@ -3,28 +3,28 @@ services: image: nginxproxy/nginx-proxy container_name: nginx-proxy ports: - - "80:80" - - "443:443" + - "80:80" + - "443:443" volumes: - - html:/usr/share/nginx/html - - certs:/etc/nginx/certs:ro - - /var/run/docker.sock:/tmp/docker.sock:ro + - html:/usr/share/nginx/html + - certs:/etc/nginx/certs:ro + - /var/run/docker.sock:/tmp/docker.sock:ro networks: - - proxy-tier + - proxy-tier acme-companion: image: nginxproxy/acme-companion container_name: nginx-proxy-acme environment: - - DEFAULT_EMAIL=mail@yourdomain.tld + - DEFAULT_EMAIL=mail@yourdomain.tld volumes_from: - - nginx-proxy + - nginx-proxy volumes: - - certs:/etc/nginx/certs:rw - - acme:/etc/acme.sh - - /var/run/docker.sock:/var/run/docker.sock:ro + - certs:/etc/nginx/certs:rw + - acme:/etc/acme.sh + - /var/run/docker.sock:/var/run/docker.sock:ro networks: - - proxy-tier + - proxy-tier networks: proxy-tier: From 8912a6a6c2cdf23407a914de769ec6c4f1903589 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Thu, 26 Jun 2025 19:10:48 +0200 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=93=9D(compose)=20Remove=20double=20c?= =?UTF-8?q?olon=20from=20yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It doesn't look like this is supposed to be there. Signed-off-by: Luca Weiss --- docs/examples/compose/keycloak/compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/examples/compose/keycloak/compose.yaml b/docs/examples/compose/keycloak/compose.yaml index e271e3353e..008bbfd4f8 100644 --- a/docs/examples/compose/keycloak/compose.yaml +++ b/docs/examples/compose/keycloak/compose.yaml @@ -23,7 +23,7 @@ services: # - VIRTUAL_PORT=8080 # used by nginx proxy # - LETSENCRYPT_HOST=id.yourdomain.tld # used by lets encrypt to generate TLS certificate depends_on: - kc_postgresql:: + kc_postgresql: condition: service_healthy restart: true # Uncomment if using our nginx proxy example From 17efa254f873c4b3447f3ee3f72407160f399e17 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Thu, 26 Jun 2025 19:19:10 +0200 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=93=9D(compose)=20Whitespace=20cleanu?= =?UTF-8?q?p=20in=20default.conf.template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Luca Weiss --- .../files/production/etc/nginx/conf.d/default.conf.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/files/production/etc/nginx/conf.d/default.conf.template b/docker/files/production/etc/nginx/conf.d/default.conf.template index 43544bb0d4..3d4a866f15 100644 --- a/docker/files/production/etc/nginx/conf.d/default.conf.template +++ b/docker/files/production/etc/nginx/conf.d/default.conf.template @@ -68,7 +68,7 @@ server { proxy_set_header Host $host; } - location /collaboration/api/ { + location /collaboration/api/ { # Collaboration server proxy_pass http://${YPROVIDER_HOST}:4444; proxy_set_header Host $host; @@ -95,7 +95,7 @@ server { add_header Content-Security-Policy "default-src 'none'" always; } - + location /media-auth { proxy_pass http://docs_backend/api/v1.0/documents/media-auth/; proxy_set_header X-Forwarded-Proto https; @@ -109,4 +109,4 @@ server { proxy_set_header Content-Length ""; proxy_set_header X-Original-Method $request_method; } -} \ No newline at end of file +} From b5e5987e49c7051405969e708fe6e26a98bf0d71 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Thu, 26 Jun 2025 19:19:24 +0200 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=93=9D(compose)=20Increase=20attachme?= =?UTF-8?q?nt=20upload=20size=20to=2010=20MB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mostly give this as an example how a person deploying this knows which knob to turn. Signed-off-by: Luca Weiss --- docker/files/production/etc/nginx/conf.d/default.conf.template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/files/production/etc/nginx/conf.d/default.conf.template b/docker/files/production/etc/nginx/conf.d/default.conf.template index 3d4a866f15..d1c4a8e3e4 100644 --- a/docker/files/production/etc/nginx/conf.d/default.conf.template +++ b/docker/files/production/etc/nginx/conf.d/default.conf.template @@ -11,6 +11,9 @@ server { server_name localhost; charset utf-8; + # increase max upload size + client_max_body_size 10m; + # Disables server version feedback on pages and in headers server_tokens off;