Skip to content

Commit a4323bf

Browse files
bugfix release + fix some docker compose file errors (dev)
1 parent 1b012bf commit a4323bf

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

api

docker-compose-dev.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: marble
22

33
x-backend-image-version: &backend-image-version
4-
image: europe-west1-docker.pkg.dev/marble-infra/marble/marble-backend:v0.38.2
4+
image: europe-west1-docker.pkg.dev/marble-infra/marble/marble-backend:v0.38.3
55
x-frontend-image-version: &frontend-image-version
66
image: europe-west1-docker.pkg.dev/marble-infra/marble/marble-frontend:v0.38.0
77

@@ -16,6 +16,7 @@ x-backend-environment: &backend-env
1616
PG_PORT: ${PG_PORT:-5432}
1717
PG_USER: postgres
1818
PG_PASSWORD: changeme
19+
PG_DATABASE: marble
1920

2021
INGESTION_BUCKET_URL: ${INGESTION_BUCKET_URL:-}
2122
CASE_MANAGER_BUCKET_URL: ${CASE_MANAGER_BUCKET_URL:-}
@@ -43,9 +44,12 @@ x-frontend-environment: &frontend-env
4344
SESSION_MAX_AGE: 43200
4445

4546
MARBLE_API_URL_CLIENT: http://localhost:${HOST_API_PORT:-8080}
46-
MARBLE_API_URL_SERVER: http://api:${HOST_API_PORT:-8080}
47+
MARBLE_API_URL_SERVER: http://api:8080
4748

4849
FIREBASE_AUTH_EMULATOR_HOST: localhost:9099
50+
FIREBASE_API_KEY: placeholder
51+
# default value of FIREBASE_PROJECT_ID must be kept if working with the emulator (and the emulator is running in the docker image below)
52+
FIREBASE_PROJECT_ID: test-project
4953

5054
SEGMENT_WRITE_KEY: ${SEGMENT_WRITE_KEY:-hC8qrY2OLhUpl1Xycw523tbuClxlQR6u}
5155

docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: marble
22

33
x-backend-image-version: &backend-image-version
4-
image: europe-west1-docker.pkg.dev/marble-infra/marble/marble-backend:v0.38.2
4+
image: europe-west1-docker.pkg.dev/marble-infra/marble/marble-backend:v0.38.3
55
x-frontend-image-version: &frontend-image-version
66
image: europe-west1-docker.pkg.dev/marble-infra/marble/marble-frontend:v0.38.0
77

kubernetes/.versions

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MARBLE-FRONT-IMG=v0.38.0
22
MARBLE-FRONT-VERSION=0.38.0
3-
MARBLE-BACK-IMG=v0.38.2
4-
MARBLE-BACK-VERSION=0.38.2
5-
APPLICATION-VERSION=0.38.0
3+
MARBLE-BACK-IMG=v0.38.3
4+
MARBLE-BACK-VERSION=0.38.3
5+
APPLICATION-VERSION=0.38.1

0 commit comments

Comments
 (0)