Skip to content

Commit cac7a14

Browse files
arcuri82arcuri82
authored
Merge pull request #156 from WebFuzzing/variable-external-endpoint
Variable external endpoint
2 parents f57b43b + 03d2727 commit cac7a14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+141
-310
lines changed

‎dockerfiles/bibliothek.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ services:
33
build:
44
dockerfile: ./dockerfiles/bibliothek.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
@@ -12,14 +13,7 @@ services:
1213
# volumes:
1314
# default env does not work on volumes
1415
# - ${JACOCODIR}:/jacoco
15-
1616
db:
1717
image: mongo:6
1818
tmpfs:
19-
- '/data/db'
20-
21-
22-
23-
24-
25-
19+
- '/data/db'

‎dockerfiles/blogapi.yaml‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ services:
33
build:
44
dockerfile: ./dockerfiles/blogapi.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
@@ -13,35 +14,20 @@ services:
1314
# default env does not work on volumes
1415
# - ${JACOCODIR}:/jacoco
1516
depends_on:
16-
1717
db:
1818
condition: service_healthy
19-
20-
21-
2219
db:
2320
image: mysql:8.0
2421
tmpfs:
2522
- '/var/lib/mysql'
26-
27-
2823
environment:
2924
MYSQL_ROOT_PASSWORD: root
3025
MYSQL_DATABASE: blogapi
31-
32-
33-
3426
volumes:
3527
- ../scripts/dockerize/data/additional_files/blogapi/blogapi.sql:/docker-entrypoint-initdb.d/blogapi.sql
3628
- ../scripts/dockerize/data/additional_files/blogapi/data.sql:/docker-entrypoint-initdb.d/data.sql
37-
38-
39-
4029
healthcheck:
4130
test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
4231
interval: 30s
4332
timeout: 30s
44-
retries: 3
45-
46-
47-
33+
retries: 3

‎dockerfiles/catwatch.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ services:
33
build:
44
dockerfile: ./dockerfiles/catwatch.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
1011
- "${HOST_PORT:-8080}:8080"
1112
- "${JACOCO_PORT:-6300}:6300"
1213
# volumes:
1314
# default env does not work on volumes
14-
# - ${JACOCODIR}:/jacoco
15-
15+
# - ${JACOCODIR}:/jacoco

‎dockerfiles/cwa-verification.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ services:
33
build:
44
dockerfile: ./dockerfiles/cwa-verification.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
1011
- "${HOST_PORT:-8080}:8080"
1112
- "${JACOCO_PORT:-6300}:6300"
1213
# volumes:
1314
# default env does not work on volumes
14-
# - ${JACOCODIR}:/jacoco
15-
15+
# - ${JACOCODIR}:/jacoco

‎dockerfiles/erc20-rest-service.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ services:
33
build:
44
dockerfile: ./dockerfiles/erc20-rest-service.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
1011
- "${HOST_PORT:-8080}:8080"
1112
- "${JACOCO_PORT:-6300}:6300"
1213
# volumes:
1314
# default env does not work on volumes
14-
# - ${JACOCODIR}:/jacoco
15-
15+
# - ${JACOCODIR}:/jacoco

‎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: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ services:
33
build:
44
dockerfile: ./dockerfiles/familie-ba-sak.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
@@ -12,29 +13,21 @@ services:
1213
# volumes:
1314
# default env does not work on volumes
1415
# - ${JACOCODIR}:/jacoco
15-
1616
db:
1717
image: postgres:13.13
1818
tmpfs:
1919
- '/var/lib/postgresql/data'
20-
21-
2220
environment:
2321
POSTGRES_PASSWORD: password
2422
POSTGRES_HOST_AUTH_METHOD: trust
2523
POSTGRES_DB: familiebasak
26-
27-
28-
29-
30-
31-
3224
mock-oauth2-server:
3325
image: ghcr.io/navikt/mock-oauth2-server:2.0.1
3426
environment:
35-
LOG_LEVEL: VERBOSE
36-
SERVER_PORT: 8083
27+
LOG_LEVEL: verbose
28+
SERVER_PORT: ${AUTH_PORT:-8081}
3729
JSON_CONFIG_PATH: /app/mockoauth2.json
3830
volumes:
3931
- ../scripts/dockerize/data/additional_files/familie-ba-sak/mockoauth2.json:/app/mockoauth2.json
40-
32+
ports:
33+
- '${AUTH_PORT:-8081}:${AUTH_PORT:-8081}'

‎dockerfiles/features-service.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ services:
33
build:
44
dockerfile: ./dockerfiles/features-service.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
1011
- "${HOST_PORT:-8080}:8080"
1112
- "${JACOCO_PORT:-6300}:6300"
1213
# volumes:
1314
# default env does not work on volumes
14-
# - ${JACOCODIR}:/jacoco
15-
15+
# - ${JACOCODIR}:/jacoco

‎dockerfiles/genome-nexus.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ services:
33
build:
44
dockerfile: ./dockerfiles/genome-nexus.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
@@ -12,14 +13,7 @@ services:
1213
# volumes:
1314
# default env does not work on volumes
1415
# - ${JACOCODIR}:/jacoco
15-
1616
db:
1717
image: mongo:3.6.2
1818
tmpfs:
19-
- '/data/db'
20-
21-
22-
23-
24-
25-
19+
- '/data/db'

‎dockerfiles/gestaohospital.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ services:
33
build:
44
dockerfile: ./dockerfiles/gestaohospital.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
@@ -12,14 +13,7 @@ services:
1213
# volumes:
1314
# default env does not work on volumes
1415
# - ${JACOCODIR}:/jacoco
15-
1616
db:
1717
image: mongo:6
1818
tmpfs:
19-
- '/data/db'
20-
21-
22-
23-
24-
25-
19+
- '/data/db'

0 commit comments

Comments
 (0)