Skip to content

Commit 03d2727

Browse files
committed
familie-tiltak auth
1 parent 20ee535 commit 03d2727

File tree

6 files changed

+15
-20
lines changed

6 files changed

+15
-20
lines changed

dockerfiles/familie-ba-sak.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ ENTRYPOINT \
1414
# -javaagent:jacocoagent.jar=destfile=./jacoco/familie-ba-sak__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
1515
-javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
1616
-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 \
17-
--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
17+
--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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ services:
2424
mock-oauth2-server:
2525
image: ghcr.io/navikt/mock-oauth2-server:2.0.1
2626
environment:
27-
LOG_LEVEL: VERBOSE
28-
SERVER_PORT: 8083
27+
LOG_LEVEL: verbose
28+
SERVER_PORT: ${AUTH_PORT:-8081}
2929
JSON_CONFIG_PATH: /app/mockoauth2.json
3030
volumes:
31-
- ../scripts/dockerize/data/additional_files/familie-ba-sak/mockoauth2.json:/app/mockoauth2.json
31+
- ../scripts/dockerize/data/additional_files/familie-ba-sak/mockoauth2.json:/app/mockoauth2.json
32+
ports:
33+
- '${AUTH_PORT:-8081}:${AUTH_PORT:-8081}'

dockerfiles/tiltaksgjennomforing.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ ENTRYPOINT \
1414
# -javaagent:jacocoagent.jar=destfile=./jacoco/tiltaksgjennomforing__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
1515
-javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
1616
-jar tiltaksgjennomforing-sut.jar \
17-
--server.port=8080 --spring.profiles.active=dev-gcp-labs --spring.datasource.driverClassName=org.postgresql.Driver --spring.sql.init.platform=postgres --no.nav.security.jwt.issuer.aad.discoveryurl=http://mock-oauth2-server:8083/aad/.well-known/openid-configuration --no.nav.security.jwt.issuer.aad.accepted_audience=aad --no.nav.security.jwt.issuer.system.discoveryurl=http://mock-oauth2-server:8083/system/.well-known/openid-configuration --no.nav.security.jwt.issuer.system.accepted_audience=system --no.nav.security.jwt.issuer.tokenx.discoveryurl=http://mock-oauth2-server:8083/tokenx/.well-known/openid-configuration --no.nav.security.jwt.issuer.tokenx.accepted_audience=tokenx --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/tiltaksgjennomforing --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO
17+
--server.port=8080 --spring.profiles.active=dev-gcp-labs --spring.datasource.driverClassName=org.postgresql.Driver --spring.sql.init.platform=postgres --no.nav.security.jwt.issuer.aad.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/aad/.well-known/openid-configuration --no.nav.security.jwt.issuer.aad.accepted_audience=aad --no.nav.security.jwt.issuer.system.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/system/.well-known/openid-configuration --no.nav.security.jwt.issuer.system.accepted_audience=system --no.nav.security.jwt.issuer.tokenx.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/tokenx/.well-known/openid-configuration --no.nav.security.jwt.issuer.tokenx.accepted_audience=tokenx --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/tiltaksgjennomforing --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO

dockerfiles/tiltaksgjennomforing.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ services:
2424
mock-oauth2-server:
2525
image: ghcr.io/navikt/mock-oauth2-server:2.0.1
2626
environment:
27-
LOG_LEVEL: VERBOSE
28-
SERVER_PORT: 8083
27+
LOG_LEVEL: verbose
28+
SERVER_PORT: ${AUTH_PORT:-8081}
2929
JSON_CONFIG_PATH: /app/mockoauth2.json
3030
volumes:
31-
- ../scripts/dockerize/data/additional_files/tiltaksgjennomforing/mockoauth2.json:/app/mockoauth2.json
31+
- ../scripts/dockerize/data/additional_files/tiltaksgjennomforing/mockoauth2.json:/app/mockoauth2.json
32+
ports:
33+
- '${AUTH_PORT:-8081}:${AUTH_PORT:-8081}'

scripts/dockerize/data/sut.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME,Dockerized,JVM_PARAMETERS,INPUT_PARAMETERS,SWAGGER_URL,TARGET_URL,COPY_ADDITIONAL_FILES,MOCK_OAUTH,DEPENDS_ON,SERVICES
2-
familie-ba-sak,TRUE,-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,--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,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,TRUE,"","[{""image_name"": ""postgres:13.13"", ""tmp_fs"": ""/var/lib/postgresql/data"", ""environment"": ""POSTGRES_PASSWORD: password;POSTGRES_HOST_AUTH_METHOD: trust;POSTGRES_DB: familiebasak"", ""volume"": """", ""health_check_command"": """"}]"
2+
familie-ba-sak,TRUE,-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,--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,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,TRUE,"","[{""image_name"": ""postgres:13.13"", ""tmp_fs"": ""/var/lib/postgresql/data"", ""environment"": ""POSTGRES_PASSWORD: password;POSTGRES_HOST_AUTH_METHOD: trust;POSTGRES_DB: familiebasak"", ""volume"": """", ""health_check_command"": """"},{""name"":""mock-oauth2-server"",""image_name"": ""ghcr.io/navikt/mock-oauth2-server:2.0.1"", ""tmp_fs"": """", ""environment"": ""LOG_LEVEL: verbose;SERVER_PORT: ${AUTH_PORT:-8081};JSON_CONFIG_PATH: /app/mockoauth2.json"", ""volume"": ""../scripts/dockerize/data/additional_files/familie-ba-sak/mockoauth2.json:/app/mockoauth2.json"", ""port"": ""${AUTH_PORT:-8081}:${AUTH_PORT:-8081}"", ""health_check_command"": """"}]"
33
pay-publicapi,TRUE,-Ddw.server.applicationConnectors[0].port=8080 -Ddw.server.adminConnectors[0].port=0 -Ddw.redis.endpoint=db:6379,server em_config.yaml,http://localhost:8080/assets/swagger.json,http://localhost:8080,TRUE,FALSE,"","[{""image_name"": ""redis:7.2.3"", ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
44
session-service,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6.0"", ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
55
bibliothek,TRUE,"",--server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.storagePath=./tmp/bibliothek/,http://localhost:8080/openapi,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6"", ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
@@ -23,7 +23,7 @@ user-management,TRUE,"","--server.port=8080 --spring.datasource.url=""jdbc:mysql
2323
youtube-mock,TRUE,"",--server.port=8080,http://localhost:8080/swagger.yaml,http://localhost:8080,FALSE,FALSE,"",
2424
person-controller,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017 --spring.cache.type=None,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:7.0"", ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
2525
tracking-system,TRUE,"","--server.port=8080 --spring.profiles.active=dev --spring.datasource.url=""jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1"" --spring.datasource.username=sa --spring.datasource.password",http://localhost:8080/app/v2/api-docs,http://localhost:8080,FALSE,FALSE,"",
26-
tiltaksgjennomforing,TRUE,"",--server.port=8080 --spring.profiles.active=dev-gcp-labs --spring.datasource.driverClassName=org.postgresql.Driver --spring.sql.init.platform=postgres --no.nav.security.jwt.issuer.aad.discoveryurl=http://mock-oauth2-server:8083/aad/.well-known/openid-configuration --no.nav.security.jwt.issuer.aad.accepted_audience=aad --no.nav.security.jwt.issuer.system.discoveryurl=http://mock-oauth2-server:8083/system/.well-known/openid-configuration --no.nav.security.jwt.issuer.system.accepted_audience=system --no.nav.security.jwt.issuer.tokenx.discoveryurl=http://mock-oauth2-server:8083/tokenx/.well-known/openid-configuration --no.nav.security.jwt.issuer.tokenx.accepted_audience=tokenx --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/tiltaksgjennomforing --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO,http://localhost:8080/tiltaksgjennomforing-api/v3/api-docs,http://localhost:8080,FALSE,TRUE,"","[{""image_name"": ""postgres:13.13"", ""tmp_fs"": ""/var/lib/postgresql/data"", ""environment"": ""POSTGRES_PASSWORD: password;POSTGRES_HOST_AUTH_METHOD: trust;POSTGRES_DB: tiltaksgjennomforing"", ""volume"": """", ""health_check_command"": """"}]"
26+
tiltaksgjennomforing,TRUE,"",--server.port=8080 --spring.profiles.active=dev-gcp-labs --spring.datasource.driverClassName=org.postgresql.Driver --spring.sql.init.platform=postgres --no.nav.security.jwt.issuer.aad.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/aad/.well-known/openid-configuration --no.nav.security.jwt.issuer.aad.accepted_audience=aad --no.nav.security.jwt.issuer.system.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/system/.well-known/openid-configuration --no.nav.security.jwt.issuer.system.accepted_audience=system --no.nav.security.jwt.issuer.tokenx.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/tokenx/.well-known/openid-configuration --no.nav.security.jwt.issuer.tokenx.accepted_audience=tokenx --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/tiltaksgjennomforing --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO,http://localhost:8080/tiltaksgjennomforing-api/v3/api-docs,http://localhost:8080,FALSE,TRUE,"","[{""image_name"": ""postgres:13.13"", ""tmp_fs"": ""/var/lib/postgresql/data"", ""environment"": ""POSTGRES_PASSWORD: password;POSTGRES_HOST_AUTH_METHOD: trust;POSTGRES_DB: tiltaksgjennomforing"", ""volume"": """", ""health_check_command"": """"},{""name"":""mock-oauth2-server"",""image_name"": ""ghcr.io/navikt/mock-oauth2-server:2.0.1"", ""tmp_fs"": """", ""environment"": ""LOG_LEVEL: verbose;SERVER_PORT: ${AUTH_PORT:-8081};JSON_CONFIG_PATH: /app/mockoauth2.json"", ""volume"": ""../scripts/dockerize/data/additional_files/tiltaksgjennomforing/mockoauth2.json:/app/mockoauth2.json"", ""port"": ""${AUTH_PORT:-8081}:${AUTH_PORT:-8081}"", ""health_check_command"": """"}]"
2727
ohsome-api,TRUE,"",--server.port=8080 --database.db=heidelberg,http:///localhost:8080/docs?group=Data%20Aggregation,http://localhost:8080,TRUE,FALSE,"",
2828
spring-batch-rest,TRUE,"",--server.port=8080 --spring.batch.job.enabled=false --lastNamePrefix= --upperCase=false,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"",
2929
spring-rest-example,TRUE,"","--server.port=8080 --spring.datasource.username=root --spring.datasource.password=root --spring.datasource.url=""jdbc:mysql://db:3306/example?useSSL=false&allowPublicKeyRetrieval=true""",http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"db","[{""image_name"": ""mysql:8.0"", ""tmp_fs"": ""/var/lib/mysql"", ""environment"": ""MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: example"", ""volume"": """", ""health_check_command"": [""CMD"", ""mysqladmin"", ""ping"", ""-h"", ""localhost""]}]"

scripts/dockerize/templates/template.docker-compose.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,5 @@ services:
2323
{% for db_block in DATABASES %}
2424
{{ db_block }}
2525
{% endfor %}
26-
{%- if MOCK_OAUTH %}
27-
mock-oauth2-server:
28-
image: ghcr.io/navikt/mock-oauth2-server:2.0.1
29-
environment:
30-
LOG_LEVEL: VERBOSE
31-
SERVER_PORT: 8083
32-
JSON_CONFIG_PATH: /app/mockoauth2.json
33-
volumes:
34-
- ../scripts/dockerize/data/additional_files/{{SUT_NAME}}/mockoauth2.json:/app/mockoauth2.json
35-
{% endif %}
26+
3627

0 commit comments

Comments
 (0)