Skip to content

Commit a5feb29

Browse files
committed
Starter hele IM verdikjede i autotest
1 parent 34caf76 commit a5feb29

File tree

3 files changed

+57
-9
lines changed

3 files changed

+57
-9
lines changed

resources/pipeline/compose-github.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ services:
3535
mem_limit: 1gb
3636
fptilgang:
3737
mem_limit: 1gb
38+
fpinntektsmelding:
39+
mem_limit: 1gb

resources/pipeline/compose.yml

Lines changed: 54 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -570,9 +570,10 @@ services:
570570
mem_limit: 512mb
571571
environment:
572572
FPDOKGEN_URL: http://fpdokgen:8080
573-
ARBEIDSGIVER_NOTIFIKASJON_URL: http://fager-api:8080/api/graphql
573+
ARBEIDSGIVER_NOTIFIKASJON_URL: http://vtp:8060/rest/api/fager/graphql
574574
ARBEIDSGIVER_NOTIFIKASJON_SCOPES: api://vtp.teamforeldrepenger.vtp/.default
575575
ALTINN_URL: http://vtp:8060/rest/altinn-rettigheter-proxy/ekstern/altinn/api/serviceowner/reportees
576+
INNTEKTSMELDING_SKJEMA_LENKE: http://localhost:9300/fp-im-dialog
576577
env_file:
577578
- *common-properties
578579
- fpinntektsmelding_datasource.env
@@ -590,17 +591,61 @@ services:
590591
condition: service_healthy
591592
vtp:
592593
condition: service_healthy
593-
fager-api:
594-
condition: service_started
595594

596-
fager-api:
597-
image: ghcr.io/navikt/arbeidsgiver-notifikasjon-produsent-api/fake-produsent-api:latest
598-
container_name: fager-api
599-
mem_limit: 256mb
595+
wonderwall-fpinntektsmelding-frontend:
596+
<<: *default-konfigurasjon
597+
image: ghcr.io/nais/wonderwall:latest
598+
container_name: wonderwall-fpinntektsmelding-frontend
599+
command: |
600+
--openid.provider=idporten
601+
--sso.enabled=true
602+
--sso.mode=proxy
603+
--sso.session-cookie-name=selvbetjening-session
604+
--encryption-key=G8BBWhxLFKVZkPLLgy01SrLLsvW0uc9t7wG7EbtClW8=
605+
--sso.server-url=http://localhost:9111
606+
--redis.uri=redis://redis:6379
607+
--session.refresh-auto=false
608+
--auto-login=true
609+
--log-level=debug
610+
--bind-address=0.0.0.0:9300
611+
--ingress=http://localhost:9300
612+
--upstream-host=fpinntektsmelding-frontend:9050
613+
ports:
614+
- "127.0.0.1:9300:9300"
615+
env_file:
616+
- *common-properties
617+
depends_on:
618+
- redis
619+
- wonderwall-selvbetjening-sso-server
620+
621+
fpinntektsmelding-frontend:
622+
<<: *default-konfigurasjon
623+
image: $FPINNTEKTSMELDINGFRONTEND_IMAGE
624+
container_name: fpinntektsmelding-frontend
600625
ports:
601-
- "127.0.0.1:8072:8080"
626+
- "127.0.0.1:9050:9050"
627+
env_file:
628+
- *common-properties
602629
environment:
603-
ALWAYS_SUCCESSFUL_RESPONSE: true
630+
AZURE_APP_CLIENT_ID: ""
631+
AZURE_APP_CLIENT_SECRET: ""
632+
AZURE_OPENID_CONFIG_ISSUER: ""
633+
AZURE_OPENID_CONFIG_TOKEN_ENDPOINT: ""
634+
AZURE_OPENID_CONFIG_JWKS_URI: ""
635+
AZURE_APP_WELL_KNOWN_URL: ""
636+
AZURE_APP_JWK: ""
637+
AZURE_APP_JWKS: ""
638+
AZURE_APP_PRE_AUTHORIZED_APPS: ""
639+
NODE_ENV: development
640+
EXPRESS_PORT: 9050
641+
EXPRESS_HOST: "::"
642+
API_SCOPE: api://vtp.teamforeldrepenger.vtp/.default
643+
API_URL: http://fpinntektsmelding:8040/fpinntektsmelding
644+
ENV: dev
645+
NESTED_PATH: /fp-im-dialog
646+
depends_on:
647+
- fpinntektsmelding
648+
- wonderwall-fpinntektsmelding-frontend
604649

605650
## SELVBETJENING SPESIFIKK
606651
foreldrepengesoknad-api:

resources/pipeline/update-versions.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@ echo FPOVERSIKT_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-managem
4141
echo FPSWAGGER_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fp-swagger")" >> .env
4242
echo FPTILGANG_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fp-tilgang")" >> .env
4343
echo FPINNTEKTSMELDING_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/ft-inntektsmelding")" >> .env
44+
echo FPINNTEKTSMELDINGFRONTEND_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/ft-inntektsmelding-frontend")" >> .env
4445

4546
echo ".env fil opprettet - Klart for docker compose up"

0 commit comments

Comments
 (0)