Variable external endpoint

dockerfiles/bibliothek.yaml

@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/bibliothek.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,14 +13,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: mongo:6
     tmpfs:
-      - '/data/db'
-
-
-
-
-
-
+      - '/data/db'

dockerfiles/blogapi.yaml

@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/blogapi.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -13,35 +14,20 @@ services:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
     depends_on:
-
       db:
           condition: service_healthy
-
-
-
   db:
     image: mysql:8.0
     tmpfs:
       - '/var/lib/mysql'
-
-
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: blogapi
-
-
-
     volumes:
       - ../scripts/dockerize/data/additional_files/blogapi/blogapi.sql:/docker-entrypoint-initdb.d/blogapi.sql
       - ../scripts/dockerize/data/additional_files/blogapi/data.sql:/docker-entrypoint-initdb.d/data.sql
-
-
-
     healthcheck:
       test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
       interval: 30s
       timeout: 30s
-      retries: 3
-
-
-
+      retries: 3

dockerfiles/catwatch.yaml

@@ -3,13 +3,13 @@ services:
     build:
       dockerfile: ./dockerfiles/catwatch.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
       - "${HOST_PORT:-8080}:8080"
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco

dockerfiles/cwa-verification.yaml

@@ -3,13 +3,13 @@ services:
     build:
       dockerfile: ./dockerfiles/cwa-verification.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
       - "${HOST_PORT:-8080}:8080"
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco

dockerfiles/erc20-rest-service.yaml

@@ -3,13 +3,13 @@ services:
     build:
       dockerfile: ./dockerfiles/erc20-rest-service.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
       - "${HOST_PORT:-8080}:8080"
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco

dockerfiles/familie-ba-sak.dockerfile

@@ -14,4 +14,4 @@ ENTRYPOINT \
 #    -javaagent:jacocoagent.jar=destfile=./jacoco/familie-ba-sak__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
     -DAZUREAD_TOKEN_ENDPOINT_URL=http://fake-azure-token-endpoint.no:8080 -DAZURE_OPENID_CONFIG_TOKEN_ENDPOINT=bar -DAZURE_APP_CLIENT_ID=bar -DNAIS_APP_NAME=bar -DUNLEASH_SERVER_API_URL=http://fake-unleash-server-api.no:8080 -DUNLEASH_SERVER_API_TOKEN=bar -DBA_SAK_CLIENT_ID=some-audience -jar familie-ba-sak-sut.jar \
-    --server.port=8080 --spring.profiles.active=dev --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/familiebasak --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --funksjonsbrytere.kafka.producer.enabled=false --funksjonsbrytere.enabled=false --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO --no.nav.security.jwt.issuer.azuread.discoveryurl=http://mock-oauth2-server:8083/azuread/.well-known/openid-configuration --prosessering.rolle=928636f4-fd0d-4149-978e-a6fb68bb19de --FAMILIE_EF_SAK_API_URL=http://fake-familie-ef-sak/api --FAMILIE_KLAGE_URL=http://fake-familie-klage --FAMILIE_BREV_API_URL=http://fake-familie-brev --FAMILIE_BA_INFOTRYGD_FEED_API_URL=http://fake-familie-ba-infotrygd-feed/api --FAMILIE_BA_INFOTRYGD_API_URL=http://fake-familie-ba-infotrygd --FAMILIE_TILBAKE_API_URL=http://fake-familie-tilbake/api --PDL_URL=http://fake-pdl-api.default --FAMILIE_INTEGRASJONER_API_URL=http://fake-familie-integrasjoner/api --FAMILIE_OPPDRAG_API_URL=http://fake-familie-oppdrag/api --SANITY_FAMILIE_API_URL=http://fake-xsrv1mh6.apicdn.sanity.io/v2021-06-07/data/query/ba-brev --ECB_API_URL=http://fake-data-api.ecb.europa.eu/service/data/EXR/ --rolle.veileder=93a26831-9866-4410-927b-74ff51a9107c --rolle.saksbehandler=d21e00a4-969d-4b28-8782-dc818abfae65 --rolle.beslutter=9449c153-5a1e-44a7-84c6-7cc7a8867233 --rolle.forvalter=c62e908a-cf20-4ad0-b7b3-3ff6ca4bf38b --rolle.kode6=5ef775f2-61f8-4283-bf3d-8d03f428aa14 --rolle.kode7=ea930b6b-9397-44d9-b9e6-f4cf527a632a
+    --server.port=8080 --spring.profiles.active=dev --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/familiebasak --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --funksjonsbrytere.kafka.producer.enabled=false --funksjonsbrytere.enabled=false --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO --no.nav.security.jwt.issuer.azuread.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/azuread/.well-known/openid-configuration --prosessering.rolle=928636f4-fd0d-4149-978e-a6fb68bb19de --FAMILIE_EF_SAK_API_URL=http://fake-familie-ef-sak/api --FAMILIE_KLAGE_URL=http://fake-familie-klage --FAMILIE_BREV_API_URL=http://fake-familie-brev --FAMILIE_BA_INFOTRYGD_FEED_API_URL=http://fake-familie-ba-infotrygd-feed/api --FAMILIE_BA_INFOTRYGD_API_URL=http://fake-familie-ba-infotrygd --FAMILIE_TILBAKE_API_URL=http://fake-familie-tilbake/api --PDL_URL=http://fake-pdl-api.default --FAMILIE_INTEGRASJONER_API_URL=http://fake-familie-integrasjoner/api --FAMILIE_OPPDRAG_API_URL=http://fake-familie-oppdrag/api --SANITY_FAMILIE_API_URL=http://fake-xsrv1mh6.apicdn.sanity.io/v2021-06-07/data/query/ba-brev --ECB_API_URL=http://fake-data-api.ecb.europa.eu/service/data/EXR/ --rolle.veileder=93a26831-9866-4410-927b-74ff51a9107c --rolle.saksbehandler=d21e00a4-969d-4b28-8782-dc818abfae65 --rolle.beslutter=9449c153-5a1e-44a7-84c6-7cc7a8867233 --rolle.forvalter=c62e908a-cf20-4ad0-b7b3-3ff6ca4bf38b --rolle.kode6=5ef775f2-61f8-4283-bf3d-8d03f428aa14 --rolle.kode7=ea930b6b-9397-44d9-b9e6-f4cf527a632a

dockerfiles/familie-ba-sak.yaml

@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/familie-ba-sak.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,29 +13,21 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: postgres:13.13
     tmpfs:
       - '/var/lib/postgresql/data'
-
-
     environment:
       POSTGRES_PASSWORD: password
       POSTGRES_HOST_AUTH_METHOD: trust
       POSTGRES_DB: familiebasak
-
-
-
-
-
-
   mock-oauth2-server:
     image: ghcr.io/navikt/mock-oauth2-server:2.0.1
     environment:
-      LOG_LEVEL: VERBOSE
-      SERVER_PORT: 8083
+      LOG_LEVEL: verbose
+      SERVER_PORT: ${AUTH_PORT:-8081}
       JSON_CONFIG_PATH: /app/mockoauth2.json
     volumes:
       - ../scripts/dockerize/data/additional_files/familie-ba-sak/mockoauth2.json:/app/mockoauth2.json
-
+    ports:
+      - '${AUTH_PORT:-8081}:${AUTH_PORT:-8081}'

dockerfiles/features-service.yaml

@@ -3,13 +3,13 @@ services:
     build:
       dockerfile: ./dockerfiles/features-service.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
       - "${HOST_PORT:-8080}:8080"
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco

dockerfiles/genome-nexus.yaml

@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/genome-nexus.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,14 +13,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: mongo:3.6.2
     tmpfs:
-      - '/data/db'
-
-
-
-
-
-
+      - '/data/db'

dockerfiles/gestaohospital.yaml

@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/gestaohospital.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,14 +13,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: mongo:6
     tmpfs:
-      - '/data/db'
-
-
-
-
-
-
+      - '/data/db'

dockerfiles/http-patch-spring.yaml

@@ -3,13 +3,13 @@ services:
     build:
       dockerfile: ./dockerfiles/http-patch-spring.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
       - "${HOST_PORT:-8080}:8080"
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco

dockerfiles/languagetool.yaml

@@ -3,13 +3,13 @@ services:
     build:
       dockerfile: ./dockerfiles/languagetool.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
       - "${HOST_PORT:-8080}:8080"
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco

dockerfiles/market.yaml

@@ -3,13 +3,13 @@ services:
     build:
       dockerfile: ./dockerfiles/market.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
       - "${HOST_PORT:-8080}:8080"
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco

dockerfiles/microcks.dockerfile

@@ -13,5 +13,5 @@ ENTRYPOINT \
 #    unfortunately dumponexit is completely unreliable in Docker :(
 #    -javaagent:jacocoagent.jar=destfile=./jacoco/microcks__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
-    -DPOSTMAN_RUNNER_URL=http://postman:3000 -DSERVICES_UPDATE_INTERVAL='0 0 0/2 * * *' -DKEYCLOAK_URL=http://keycloak:8080 -DKEYCLOAK_PUBLIC_URL=http://localhost:${HOST_PORT:-8081} -DENABLE_CORS_POLICY=false -DCORS_REST_ALLOW_CREDENTIALS=true -DTEST_CALLBACK_URL=http://localhost:${HOST_PORT:-8080} -jar microcks-sut.jar \
-    --server.port=8080 --spring.profiles.active=prod --grpc.server.port=0 --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:${HOST_PORT:-8081}/realms/microcks --spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://keycloak:${HOST_PORT:-8080}/realms/microcks/protocol/openid-connect/certs
+    -DPOSTMAN_RUNNER_URL=http://postman:3000 -DSERVICES_UPDATE_INTERVAL='0 0 0/2 * * *' -DKEYCLOAK_URL=http://keycloak:8080 -DKEYCLOAK_PUBLIC_URL=http://localhost:${AUTH_PORT:-8081} -DENABLE_CORS_POLICY=false -DCORS_REST_ALLOW_CREDENTIALS=true -DTEST_CALLBACK_URL=http://localhost:${HOST_PORT:-8080} -jar microcks-sut.jar \
+    --server.port=8080 --spring.profiles.active=prod --grpc.server.port=0 --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:${AUTH_PORT:-8081}/realms/microcks --spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://keycloak:8080/realms/microcks/protocol/openid-connect/certs