From cd17e5c5981a0c47ad3a0902dd7cea25b61910e5 Mon Sep 17 00:00:00 2001 From: Marco Herzog Date: Tue, 12 Mar 2024 10:48:18 +0100 Subject: [PATCH 1/3] Update FDA version to 0.20.0 --- quickstart/docker-compose.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml index 40f517b2b..817b7cccb 100644 --- a/quickstart/docker-compose.yml +++ b/quickstart/docker-compose.yml @@ -161,7 +161,7 @@ services: - ../quickstart/exampledata/config/keycloak:/docker-entrypoint-initdb.d fda-api: container_name: fda-api - image: registry.gitlab.com/z-e-u-s/fda/fda-backend:0.16.0 + image: registry.gitlab.com/z-e-u-s/fda/fda-backend:0.20.0 network_mode: host expose: - 8000 @@ -172,14 +172,16 @@ services: POSTGRES_HOST: localhost POSTGRES_PORT: 25432 DJANGO_SECRET_KEY: "django-insecure-*w($$5i@@iq%!ygufa%%@nfdplt(!e#hoahnjy^@6xdutl8mlqz" - ALLOWED_HOSTS: '["*"]' - CORS_ALLOWED_ORIGINS: '["http://localhost"]' + ALLOWED_HOSTS: "*" + CORS_ALLOW_ALL_ORIGINS: "true" + CORS_ALLOWED_ORIGINS: "http://localhost" KEYCLOAK_SERVER_URL: "http://localhost:8080" KEYCLOAK_REALM: logprep KEYCLOAK_CLIENT_ID: fda-backend KEYCLOAK_CLIENT_SECRET: tYfkKygb1g2Hf6fmAInoq3XPK1OILbSp KEYCLOAK_CLIENT_ID_FOR_AUTHZ_ROLES: fda SERVICE_BASE_URL: 'http://localhost:8000/' + SECURE_REDIRECT_EXEMPT: '[".*localhost.*"]' depends_on: fda-db: condition: service_healthy @@ -205,7 +207,7 @@ services: timeout: 5s retries: 10 fda-frontend: - image: registry.gitlab.com/z-e-u-s/fda/fda-frontend:0.16.0 + image: registry.gitlab.com/z-e-u-s/fda/fda-frontend:0.20.0 container_name: fda-frontend network_mode: host restart: always From ee911703951f8c92dee4b39634152be66d6387e8 Mon Sep 17 00:00:00 2001 From: Marco Herzog Date: Fri, 15 Mar 2024 12:00:30 +0100 Subject: [PATCH 2/3] Unset 'CORS_ALLOW_ALL_ORIGINS' for fda-api --- quickstart/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml index 817b7cccb..754ad632f 100644 --- a/quickstart/docker-compose.yml +++ b/quickstart/docker-compose.yml @@ -173,7 +173,6 @@ services: POSTGRES_PORT: 25432 DJANGO_SECRET_KEY: "django-insecure-*w($$5i@@iq%!ygufa%%@nfdplt(!e#hoahnjy^@6xdutl8mlqz" ALLOWED_HOSTS: "*" - CORS_ALLOW_ALL_ORIGINS: "true" CORS_ALLOWED_ORIGINS: "http://localhost" KEYCLOAK_SERVER_URL: "http://localhost:8080" KEYCLOAK_REALM: logprep From 7a7f26b72ecd08b6b7aee751bf8c2248557990ec Mon Sep 17 00:00:00 2001 From: ekneg54 Date: Sat, 23 Mar 2024 15:51:28 +0100 Subject: [PATCH 3/3] update fda to version 0.21.0 --- quickstart/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml index 754ad632f..d94a2ea51 100644 --- a/quickstart/docker-compose.yml +++ b/quickstart/docker-compose.yml @@ -161,7 +161,7 @@ services: - ../quickstart/exampledata/config/keycloak:/docker-entrypoint-initdb.d fda-api: container_name: fda-api - image: registry.gitlab.com/z-e-u-s/fda/fda-backend:0.20.0 + image: registry.gitlab.com/z-e-u-s/fda/fda-backend:0.21.0 network_mode: host expose: - 8000 @@ -206,7 +206,7 @@ services: timeout: 5s retries: 10 fda-frontend: - image: registry.gitlab.com/z-e-u-s/fda/fda-frontend:0.20.0 + image: registry.gitlab.com/z-e-u-s/fda/fda-frontend:0.21.0 container_name: fda-frontend network_mode: host restart: always