Skip to content

Commit

Permalink
Update static files config
Browse files Browse the repository at this point in the history
  • Loading branch information
HuwONS committed Jan 22, 2024
1 parent d83248d commit 6062efc
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 18 deletions.
40 changes: 22 additions & 18 deletions v2/stacks/static-files/.env
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# -- Compulsory env vars validation --
zebedee_root=${zebedee_root:?please define a valid zebedee_root in your local system}
SERVICE_AUTH_TOKEN=${SERVICE_AUTH_TOKEN:?please define a valid SERVICE_AUTH_TOKEN in your local system}
# zebedee_root=${zebedee_root:?please define a valid zebedee_root in your local system}
# SERVICE_AUTH_TOKEN=${SERVICE_AUTH_TOKEN:?please define a valid SERVICE_AUTH_TOKEN in your local system}
zebedee_root="/Users/huw/zebedee-content"
SERVICE_AUTH_TOKEN="badger"
# get from dashboard or via cli e.g. https://github.com/ONSdigital/dp-identity-api/blob/ec5cda08c9f1c1e718cf271eaffc7efa8fe26c24/Makefile#L32
AWS_COGNITO_USER_POOL_ID=${AWS_COGNITO_USER_POOL_ID:?please define a valid AWS_COGNITO_USER_POOL_ID in your local system, get from cognito: sandbox-florence-users}
AWS_COGNITO_CLIENT_ID=${AWS_COGNITO_CLIENT_ID:?please define a valid AWS_COGNITO_CLIENT_ID in your local system, get from within pool}
AWS_COGNITO_CLIENT_SECRET=${AWS_COGNITO_CLIENT_SECRET:?please define a valid AWS_COGNITO_CLIENT_SECRET in your local system, get from within pool}
AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:?please define a valid AWS_ACCESS_KEY_ID in your local system, get from aws login dashboard}
AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:?please define a valid AWS_SECRET_ACCESS_KEY in your local system, get from aws login dashboard}
AWS_SESSION_TOKEN=${AWS_SESSION_TOKEN:?please define a valid AWS_SESSION_TOKEN in your local system, get from aws login dashboard}
AWS_COGNITO_USER_POOL_ID="eu-west-2_WSD9EcAsw"
AWS_COGNITO_CLIENT_ID="badger"
AWS_COGNITO_CLIENT_SECRET="badger"
AWS_ACCESS_KEY_ID="badger"
AWS_SECRET_ACCESS_KEY="badger"
AWS_SESSION_TOKEN="badger"

# -- Paths --
PATH_MANIFESTS="../../manifests"
Expand All @@ -19,24 +21,26 @@ PATH_PROVISIONING="../../provisioning"
# for local development use: http://host.docker.internal: (note: MacOS only!)

# Core
BABBAGE_URL=http://http-echo:5678 #http://babbage:8080
BABBAGE_URL=http://babbage:8080 #http://babbage:8080

# Backend
UPLOAD_API_URL=http://host.docker.internal:25100 #http://dp-upload-service:25100
DATASET_API_URL=http://http-echo:5678 #http://dp-dataset-api:22000
UPLOAD_API_URL=http://dp-upload-service:25100
DATASET_API_URL=http://dp-dataset-api:22000
FILES_API_URL=http://dp-files-api:26900
API_ROUTER_URL=http://dp-api-router:23200
IMAGE_API_URL=http://http-echo:5678
FILTER_API_URL=http://http-echo:5678
RECIPE_API_URL=http://http-echo:5678 #http://dp-recipe-api:22300
IMPORT_API_URL=http://http-echo:5678 #http://dp-import-api:21800
TOPIC_API_URL=http://http-echo:5678 #http://dp-topic-api:25300
RELEASE_CALENDAR_API_URL=http://http-echo:5678 #http://dp-release-calendar-api:27800
SEARCH_API_URL=http://http-echo:5678 #http://dp-search-api:23900"
RECIPE_API_URL=http://dp-recipe-api:22300
IMPORT_API_URL=http://dp-import-api:21800
TOPIC_API_URL=http://dp-topic-api:25300
RELEASE_CALENDAR_API_URL=http://dp-release-calendar-api:27800
SEARCH_API_URL=http://dp-search-api:23900

# Frontend
DATASET_CONTROLLER_URL=http://http-echo:5678 #http://dp-publishing-dataset-controller:24000
DATASET_CONTROLLER_URL=http://dp-publishing-dataset-controller:24000
RENDERER_URL=http://dp-frontend-renderer:20010
HOMEPAGE_CONTROLLER_URL=http://dp-frontend-homepage-controller:24400
DATASET_CONTROLLER_URL=http://http-echo:5678 #http://dp-frontend-dataset-controller:20200
# DATASET_CONTROLLER_URL=http://http-echo:5678 #http://dp-frontend-dataset-controller:20200

# -- Docker compose vars --
# https://docs.docker.com/compose/env-file/#compose-file-and-cli-variables
Expand Down
4 changes: 4 additions & 0 deletions v2/stacks/static-files/core-ons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,7 @@ services:
extends:
file: ${PATH_MANIFESTS}/core-ons/sixteens.yml
service: sixteens
dp-publishing-dataset-controller:
extends:
file: ${PATH_MANIFESTS}/core-ons/dp-publishing-dataset-controller.yml
service: dp-publishing-dataset-controller

0 comments on commit 6062efc

Please sign in to comment.