Skip to content

Commit fd60fd8

Browse files
committed
TFP-6449: Legger til fpgrunnlag i docker compose oppsett.
1 parent 37a9bf3 commit fd60fd8

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

resources/pipeline/common.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ FPOVERSIKT_API_URL=http://fpoversikt:8080/fpoversikt
1919
FPOVERSIKT_API_SCOPE=lokal
2020
FPSOKNAD_API_URL=http://fpsoknad:8080/fpsoknad
2121
FPSOKNAD_API_SCOPE=lokal
22+
FPGRUNNDATA_API_URL=http://fpgrunndata:8080/fpgrunndata
2223

2324
#### EKSTERNE INTEGRASJONER ####
2425
##### SOAP #####

resources/pipeline/compose.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,22 @@ services:
645645
condition: service_healthy
646646
fptilbake:
647647
condition: service_healthy
648+
fpgrunndata:
649+
<<: *default-konfigurasjon
650+
image: $FPGRUNNDATA_IMAGE
651+
container_name: fpgrunndata
652+
mem_limit: 256mb
653+
environment:
654+
NAIS_APP_NAME: fpgrunndata
655+
env_file:
656+
- *common-properties
657+
ports:
658+
- "127.0.0.1:9191:8080"
659+
healthcheck:
660+
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpgrunndata/internal/health/isReady" ]
661+
interval: 5s
662+
timeout: 10s
663+
retries: 10
648664
fpsoknad:
649665
<<: *default-konfigurasjon
650666
image: $FPSOKNAD_IMAGE
@@ -782,6 +798,7 @@ services:
782798
PUBLIC_PATH: /foreldrepenger/oversikt
783799
depends_on:
784800
- fpoversikt
801+
- fpgrunndata
785802
- wonderwall-foreldrepengeoversikt
786803
foreldrepengesoknad:
787804
<<: *default-konfigurasjon
@@ -798,6 +815,7 @@ services:
798815
PORT: 9067
799816
depends_on:
800817
- fpsoknad
818+
- fpgrunndata
801819
- wonderwall-foreldrepengesoknad
802820
svangerskapspengesoknad:
803821
<<: *default-konfigurasjon
@@ -814,6 +832,7 @@ services:
814832
PORT: 9068
815833
depends_on:
816834
- fpsoknad
835+
- fpgrunndata
817836
- wonderwall-svangerskapspengesoknad
818837
engangsstonad:
819838
<<: *default-konfigurasjon
@@ -830,6 +849,7 @@ services:
830849
PORT: 9069
831850
depends_on:
832851
- fpsoknad
852+
- fpgrunndata
833853
- wonderwall-engangsstonad
834854
## Swagger
835855
fpswagger:

resources/pipeline/update-versions.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ echo FORELDREPENGEOVERSIKT_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/n
3939
echo SVANGERSKAPSPENGESOKNAD_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/foreldrepengesoknad/svangerskapspengesoknad")" >> .env
4040
echo ENGANGSSTONAD_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/foreldrepengesoknad/engangsstonad")" >> .env
4141
echo FPOVERSIKT_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fp-oversikt")" >> .env
42+
echo FPGRUNNDATA_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fp-grunndata")" >> .env
4243
echo FPSWAGGER_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fp-swagger")" >> .env
4344
echo FPTILGANG_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fp-tilgang")" >> .env
4445
echo FPINNTEKTSMELDING_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fp-inntektsmelding")" >> .env

0 commit comments

Comments
 (0)