Skip to content
This repository has been archived by the owner on Sep 18, 2024. It is now read-only.

Commit

Permalink
Oppdaterer oppsett for mocks ved lokal kjøring
Browse files Browse the repository at this point in the history
  • Loading branch information
anders-nom committed Aug 25, 2023
1 parent d46e934 commit a0daf00
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 34 deletions.
12 changes: 4 additions & 8 deletions .env
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
ENV=localhost
XP_BASE_URL=http://localhost:8080
XP_BASE_URL=https://www.nav.no
APP_BASE_URL=http://localhost:8088
APP_BASE_PATH=/dekoratoren
API_XP_SERVICES_URL=http://localhost:8080/_/service
API_XP_SERVICES_URL=https://www.nav.no/_/service
API_DEKORATOREN_URL=http://localhost:8095/nav-dekoratoren-api
MINSIDE_ARBEIDSGIVER_URL=https://arbeidsgiver.nav.no/min-side-arbeidsgiver/
MIN_SIDE_URL=https:/www.nav.no/minside/
LOGIN_URL=http://localhost:5000
LOGOUT_URL=http://localhost:5000/?logout
OPPORTUNITY_ID=1234
SOLUTION_ID=789
CASETYPE_ID=666
NAV_GROUP_ID=555
LOGIN_URL=http://localhost:50000
LOGOUT_URL=http://localhost:50000/?logout
BUILD_ID=asdf
CASETYPE_ID=66D660EF-6F14-44B4-8ADE-A70A127202D0
NAV_GROUP_ID=A034081B-6B73-46B7-BE27-23B8E9CE3079
Expand Down
40 changes: 14 additions & 26 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,29 @@
version: '3.7'
services:
oidc-provider:
container_name: oidc-provider
networks:
nav.docker-internal:
aliases:
- oidc-provider.nav.docker-internal
image: 'navikt/stub-oidc-provider:latest'
container_name: oidc-provider-dekoratoren
image: 'ghcr.io/navikt/stub-oidc-provider/stub-oidc-provider:latest'
ports:
- '9000:9000'
environment:
PORT: '9000'
CALLBACK_URL: 'http://localhost:5000/callback'
CALLBACK_URL: 'http://localhost:50000/callback'
ISSUER: 'https://localhost:9000'

oidc-provider-gui:
container_name: oidc-provider-gui
networks:
nav.docker-internal:
aliases:
- oidc-provider-gui.nav.docker-internal
image: 'navikt/pb-oidc-provider-gui:latest'
container_name: oidc-provider-gui-dekoratoren
image: 'ghcr.io/navikt/pb-oidc-provider-gui/pb-oidc-provider-gui:latest'
ports:
- '5000:5000'
depends_on:
- oidc-provider
- '50000:50000'
environment:
REDIRECT_URL: 'http://localhost:8088/dekoratoren'
AUTO_REDIRECT_TO_FRONTEND: 'true'
OIDC_PROVIDER_GUI_URL: 'http://localhost:50000/callback'
depends_on:
- oidc-provider

mocks:
container_name: mocks
networks:
nav.docker-internal:
aliases:
- mocks.nav.docker-internal
container_name: mocks-dekoratoren
image: 'ghcr.io/navikt/pb-nav-mocked/pb-nav-mocked:latest'
ports:
- '8095:8080'
Expand All @@ -41,9 +32,6 @@ services:
CORS_ALLOWED_SCHEMES: 'http'
OIDC_ISSUER: 'https://localhost:9000'
OIDC_ACCEPTED_AUDIENCE: 'stubOidcClient'
OIDC_JWKS_URI: 'http://oidc-provider.nav.docker-internal:9000/certs'
OIDC_JWKS_URI: 'http://oidc-provider:9000/certs'
depends_on:
- oidc-provider

networks:
nav.docker-internal:
- oidc-provider
Empty file removed en
Empty file.
Empty file removed nb
Empty file.

0 comments on commit a0daf00

Please sign in to comment.