Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ BEFTA_S2S_CLIENT_SECRET_OF_XUI_WEBAPP=OOOOOOOOOOOOOOOO
#ACA Oauth2 secrets
BEFTA_S2S_CLIENT_SECRET_OF_AAC_MANAGE_CASE_ASSIGNMENT=AAAAAAAAAAAAAAAA

CCD_LOGSTASH_REPOSITORY_URL=hmctspublic.azurecr.io
CCD_LOGSTASH_REPOSITORY_URL=hmctsprod.azurecr.io
CCD_LOGSTASH_SERVICES=all

#ROLE_ASSIGNMENTS
Expand Down
28 changes: 22 additions & 6 deletions ccd
Original file line number Diff line number Diff line change
Expand Up @@ -691,9 +691,8 @@ function print_warn_on_compose_down_if_idam_enabled {
}

function ccd_login() {
#docker logout hmctspublic.azurecr.io &>/dev/null
az acr login --name hmctspublic --subscription DCD-CNP-Prod
az acr login --name hmctsprivate --subscription DCD-CNP-Prod
#docker logout hmctsprod.azurecr.io &>/dev/null
az acr login --name hmctsprod --subscription DCD-CNP-Prod
}

function echo_ccd() {
Expand All @@ -704,17 +703,21 @@ function echo_error() {
echo -e "\033[1;91mERROR ::--\033[0m $@" # red
}

function echo_break() {
echo -e "\033[34m-----------------------------------------------------------------------------------------------------------------------\033[0m"
}

function ccd_default() {
usage_default $*

echo_break
echo -e "\033[34m" # set blue
echo "-----------------------------------------------------------------"
echo " _____ _____ _____ ____ ___ ____ _ _______ ____"
echo " / ____/ ____| __ \\ | _ \\ / _ \\ / ___|| |/ / ____| _ \\"
echo " | | | | | | | | | | | | | | | | | ' /| _| | |_) |"
echo " | |___| |____| |__| | | |_| | |_| | |___ | . \\| |___| _ <"
echo " \\_____\\_____|_____/ |____/ \\___/ \\____||_|\\_\\_____|_| \\_\\"
echo "-----------------------------------------------------------------"
echo_break
echo -e "\033[0m" # reset color

if [ "$1" == "idam" ]; then
Expand Down Expand Up @@ -746,7 +749,7 @@ function ccd_default() {
echo_ccd "Logging into CCD container registries..."
if ! ccd_login >/dev/null; then
echo_error "CCD container registry login issues detected. Diagnosing..."
az acr check-health -n hmctspublic --yes
az acr check-health -n hmctsprod --yes
exit 1
fi

Expand Down Expand Up @@ -831,6 +834,19 @@ function ccd_default() {
echo_ccd "\033[32m[####################] 100% Complete\033[0m - Setup complete!"
fi

echo_break
if [ "$1" == "idam" ]; then
echo_ccd "Default setup with full idam compose files complete!"
echo_ccd "Access admin-web at https://localhost:3100/ with idam credentials ( e.g. ccd.docker.default@hmcts.net : Pa55word11 )"
elif [ "$1" == "xui" ]; then
echo_ccd "Default setup with idam simulator and xui frontend compose files complete!"
echo_ccd "Access admin-web at https://localhost:3100/ with idam credentials ( e.g. ccd.docker.default@hmcts.net : Pa55word11 )"
echo_ccd "Access xui frontend at http://localhost:3455/ with idam credentials ( e.g. master.caseworker@gmail.com : Pa55word11 )"
else
echo_ccd "Default setup complete!"
echo_ccd "Access admin-web at https://localhost:3100/ with idam credentials ( e.g. ccd.docker.default@hmcts.net : Pa55word11 )"
fi

exit 1
}

Expand Down
12 changes: 6 additions & 6 deletions compose/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

services:
ccd-user-profile-api:
image: "${CCD_USER_PROFILE_API_USE_LOCAL-hmctspublic.azurecr.io/}ccd/user-profile-api:${CCD_USER_PROFILE_API_TAG:-latest}"
image: "${CCD_USER_PROFILE_API_USE_LOCAL-hmctsprod.azurecr.io/}ccd/user-profile-api:${CCD_USER_PROFILE_API_TAG:-latest}"
environment:
USER_PROFILE_DB_HOST: ccd-shared-database
USER_PROFILE_DB_PORT: 5432
Expand All @@ -26,7 +26,7 @@ services:
- ccd-network

ccd-definition-store-api:
image: "${CCD_DEFINITION_STORE_API_USE_LOCAL-hmctspublic.azurecr.io/}ccd/definition-store-api:${CCD_DEFINITION_STORE_API_TAG:-latest}"
image: "${CCD_DEFINITION_STORE_API_USE_LOCAL-hmctsprod.azurecr.io/}ccd/definition-store-api:${CCD_DEFINITION_STORE_API_TAG:-latest}"
environment:
DEFINITION_STORE_DB_HOST: ccd-shared-database
DEFINITION_STORE_DB_PORT: 5432
Expand Down Expand Up @@ -67,7 +67,7 @@ services:
- ccd-network

ccd-data-store-api:
image: "${CCD_DATA_STORE_API_USE_LOCAL-hmctspublic.azurecr.io/}ccd/data-store-api:${CCD_DATA_STORE_API_TAG:-latest}"
image: "${CCD_DATA_STORE_API_USE_LOCAL-hmctsprod.azurecr.io/}ccd/data-store-api:${CCD_DATA_STORE_API_TAG:-latest}"
environment:
CASE_DOCUMENT_AM_URL: http://ccd-case-document-am-api:4455
DATA_STORE_DB_HOST: ccd-shared-database
Expand Down Expand Up @@ -126,7 +126,7 @@ services:
- ccd-network

am-role-assignment-service:
image: "${AM_ROLE_ASSIGNMENT_SERVICE_USE_LOCAL-hmctspublic.azurecr.io/}am/role-assignment-service:${AM_ROLE_ASSIGNMENT_SERVICE_TAG:-latest}"
image: "${AM_ROLE_ASSIGNMENT_SERVICE_USE_LOCAL-hmctsprod.azurecr.io/}am/role-assignment-service:${AM_ROLE_ASSIGNMENT_SERVICE_TAG:-latest}"
environment:
ROLE_ASSIGNMENT_DB_HOST: ccd-shared-database
ROLE_ASSIGNMENT_DB_NAME: role_assignment
Expand Down Expand Up @@ -171,7 +171,7 @@ services:
- ccd-network

service-auth-provider-api:
image: "hmctspublic.azurecr.io/rpe/service-auth-provider:latest"
image: "hmctsprod.azurecr.io/rpe/service-auth-provider:latest"
healthcheck:
interval: 10s
timeout: 10s
Expand Down Expand Up @@ -237,7 +237,7 @@ services:
condition: service_healthy

ccd-test-stubs-service:
image: "${CCD_TEST_STUBS_SERVICE_USE_LOCAL-hmctspublic.azurecr.io/}ccd/test-stubs-service:${CCD_TEST_STUBS_SERVICE_TAG:-latest}"
image: "${CCD_TEST_STUBS_SERVICE_USE_LOCAL-hmctsprod.azurecr.io/}ccd/test-stubs-service:${CCD_TEST_STUBS_SERVICE_TAG:-latest}"
environment:
- WIREMOCK_SERVER_MAPPINGS_PATH=wiremock
ports:
Expand Down
2 changes: 1 addition & 1 deletion compose/case-disposer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

services:
ccd-case-disposer:
image: "${CCD_CASE_DISPOSER_USE_LOCAL-hmctspublic.azurecr.io/}ccd/case-disposer:${CCD_CASE_DISPOSER_TAG:-latest}"
image: "${CCD_CASE_DISPOSER_USE_LOCAL-hmctsprod.azurecr.io/}ccd/case-disposer:${CCD_CASE_DISPOSER_TAG:-latest}"
environment:
DATA_STORE_DB_HOST: ccd-shared-database
DATA_STORE_DB_PORT: 5432
Expand Down
2 changes: 1 addition & 1 deletion compose/case-document-am.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

services:
ccd-case-document-am-api:
image: "${CCD_CASE_DOCUMENT_AM_API_USE_LOCAL-hmctspublic.azurecr.io/}ccd/case-document-am-api:${CCD_CASE_DOCUMENT_AM_API_TAG:-latest}"
image: "${CCD_CASE_DOCUMENT_AM_API_USE_LOCAL-hmctsprod.azurecr.io/}ccd/case-document-am-api:${CCD_CASE_DOCUMENT_AM_API_TAG:-latest}"
environment:
CASE_DOCUMENT_AM_API_S2S_SECRET: "${IDAM_KEY_CASE_DOCUMENT}"
CASE_DOCUMENT_S2S_AUTHORISED_SERVICES: ccd_case_document_am_api,ccd_gw,xui_webapp,ccd_data,bulk_scan_processor,bulk_scan_orchestrator
Expand Down
2 changes: 1 addition & 1 deletion compose/case-payment-orders.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
case-payment-orders-api:
image: "hmctspublic.azurecr.io/cpo/case-payment-orders-api:${CASE_PAYMENT_ORDERS_API_TAG:-latest}"
image: "hmctsprod.azurecr.io/cpo/case-payment-orders-api:${CASE_PAYMENT_ORDERS_API_TAG:-latest}"
container_name: case-payment-orders-api
environment:
SERVER_PORT: 4457
Expand Down
2 changes: 1 addition & 1 deletion compose/ccd-next-hearing-date-updater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

services:
ccd-next-hearing-date-updater:
image: "${CCD_NEXT_HEARING_DATE_UPDATER_USE_LOCAL-hmctspublic.azurecr.io/}ccd/next-hearing-date-updater:${CCD_NEXT_HEARING_DATE_UPDATER_TAG:-latest}"
image: "${CCD_NEXT_HEARING_DATE_UPDATER_USE_LOCAL-hmctsprod.azurecr.io/}ccd/next-hearing-date-updater:${CCD_NEXT_HEARING_DATE_UPDATER_TAG:-latest}"
environment:
IDAM_API_URL: "${IDAM_INTERNAL_API_BASE_URL:-http://idam:5000}"
CCD_NEXT_HEARING_DATE_UPDATER_SERVICE_IDAM_CLIENT_SECRET: AAAAAAAAAAAAAAAA
Expand Down
2 changes: 1 addition & 1 deletion compose/dm-store.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
MICROSERVICE_KEYS_EM_GW: "${IDAM_KEY_DM_STORE}"

dm-store:
image: "${DM_STORE_USE_LOCAL-hmctspublic.azurecr.io/}dm/store:${DM_STORE_TAG:-latest}"
image: "${DM_STORE_USE_LOCAL-hmctsprod.azurecr.io/}dm/store:${DM_STORE_TAG:-latest}"
healthcheck:
disable: true
environment:
Expand Down
4 changes: 2 additions & 2 deletions compose/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

services:
ccd-admin-web:
image: "${CCD_ADMIN_WEB_USE_LOCAL-hmctspublic.azurecr.io/}ccd/admin-web:${CCD_ADMIN_WEB_TAG:-latest}"
image: "${CCD_ADMIN_WEB_USE_LOCAL-hmctsprod.azurecr.io/}ccd/admin-web:${CCD_ADMIN_WEB_TAG:-latest}"
container_name: ccd-admin-web
environment:
SECURE_AUTH_COOKIE_ENABLED : "false"
Expand Down Expand Up @@ -45,7 +45,7 @@ services:
- ccd-network

ccd-api-gateway:
image: "${CCD_API_GATEWAY_USE_LOCAL-hmctspublic.azurecr.io/}ccd/api-gateway-web:${CCD_API_GATEWAY_TAG:-latest}"
image: "${CCD_API_GATEWAY_USE_LOCAL-hmctsprod.azurecr.io/}ccd/api-gateway-web:${CCD_API_GATEWAY_TAG:-latest}"
container_name: ccd-api-gateway-web
environment:
IDAM_BASE_URL: "${IDAM_INTERNAL_API_BASE_URL:-http://idam:5000}"
Expand Down
6 changes: 3 additions & 3 deletions compose/hearings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

services:
hmc-hmi-outbound-adapter:
image: "${HMC_OUTBOUND_ADAPTER_USE_LOCAL-hmctspublic.azurecr.io/}hmc/hmi-outbound-adapter:${HMC_OUTBOUND_ADAPTER_TAG:-latest}"
image: "${HMC_OUTBOUND_ADAPTER_USE_LOCAL-hmctsprod.azurecr.io/}hmc/hmi-outbound-adapter:${HMC_OUTBOUND_ADAPTER_TAG:-latest}"
container_name: hmi-outbound-adapter
environment:
SERVER_PORT: 4558
Expand Down Expand Up @@ -42,7 +42,7 @@ services:
- ccd-network

hmc-hmi-inbound-adapter:
image: "${HMC_INBOUND_ADAPTER_USE_LOCAL-hmctspublic.azurecr.io/}hmc/hmi-inbound-adapter:${HMC_INBOUND_ADAPTER_TAG:-latest}"
image: "${HMC_INBOUND_ADAPTER_USE_LOCAL-hmctsprod.azurecr.io/}hmc/hmi-inbound-adapter:${HMC_INBOUND_ADAPTER_TAG:-latest}"
container_name: hmi-inbound-adapter
environment:
SERVER_PORT: 4559
Expand Down Expand Up @@ -76,7 +76,7 @@ services:
- ccd-network

hmc-cft-hearing-service:
image: "${HMC_HEARING_SERVICE_USE_LOCAL-hmctspublic.azurecr.io/}hmc/cft-hearing-service:${HMC_HEARING_SERVICE_TAG:-latest}"
image: "${HMC_HEARING_SERVICE_USE_LOCAL-hmctsprod.azurecr.io/}hmc/cft-hearing-service:${HMC_HEARING_SERVICE_TAG:-latest}"
container_name: cft-hearing-service
environment:
SERVER_PORT: 4561
Expand Down
2 changes: 1 addition & 1 deletion compose/idam-sim.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
idam-sim:
image: "hmctspublic.azurecr.io/hmcts/rse/rse-idam-simulator:latest"
image: "hmctsprod.azurecr.io/hmcts/rse/rse-idam-simulator:latest"
container_name: idam-sim
ports:
- "5000:5000"
Expand Down
2 changes: 1 addition & 1 deletion compose/message-publisher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

services:
ccd-message-publisher:
image: "${CCD_MESSAGE_PUBLISHER_USE_LOCAL-hmctspublic.azurecr.io/}ccd/message-publisher:${CCD_MESSAGE_PUBLISHER_TAG:-latest}"
image: "${CCD_MESSAGE_PUBLISHER_USE_LOCAL-hmctsprod.azurecr.io/}ccd/message-publisher:${CCD_MESSAGE_PUBLISHER_TAG:-latest}"
environment:
DATA_STORE_DB_HOST: ccd-shared-database
DATA_STORE_DB_PORT: 5432
Expand Down
2 changes: 1 addition & 1 deletion compose/operational.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

services:
hmc-operational-reports-runner:
image: "${HMC_OPERATIONAL_REPORTS_USE_LOCAL-hmctspublic.azurecr.io/}hmc/operational-reports-runner:${HMC_OPERATIONAL_REPORTS_TAG:-latest}"
image: "${HMC_OPERATIONAL_REPORTS_USE_LOCAL-hmctsprod.azurecr.io/}hmc/operational-reports-runner:${HMC_OPERATIONAL_REPORTS_TAG:-latest}"
container_name: operational-reports-runner
environment:
SERVER_PORT: 4459
Expand Down
2 changes: 1 addition & 1 deletion compose/others.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

services:
am-database:
image: hmctspublic.azurecr.io/am/db:latest
image: hmctsprod.azurecr.io/am/db:latest
container_name: access_management_db
environment:
AM_DB: "${AM_DB}"
Expand Down
12 changes: 6 additions & 6 deletions compose/sidam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
---
services:
fr-am:
image: hmctsprivate.azurecr.io/idam/idam-fr-am:latest
image: hmctsprod.azurecr.io/idam/idam-fr-am:latest
hostname: localam
ports:
- 8080:8080
Expand All @@ -16,7 +16,7 @@ services:
condition: service_healthy

fr-idm:
image: hmctsprivate.azurecr.io/idam/idam-fr-idm:latest
image: hmctsprod.azurecr.io/idam/idam-fr-idm:latest
hostname: localidm
ports:
- 18080:18080
Expand All @@ -30,7 +30,7 @@ services:
condition: service_healthy

shared-db:
image: hmctsprivate.azurecr.io/idam/shared-db:latest
image: hmctsprod.azurecr.io/idam/shared-db:latest
ports:
- 5432:5432
networks:
Expand All @@ -51,7 +51,7 @@ services:
- ccd-network

idam-api:
image: hmctspublic.azurecr.io/idam/api:stable
image: hmctsprod.azurecr.io/idam/api:stable
ports:
- 5000:5000
networks:
Expand Down Expand Up @@ -89,7 +89,7 @@ services:
condition: service_healthy

idam-web-public:
image: hmctspublic.azurecr.io/idam/web-public:stable
image: hmctsprod.azurecr.io/idam/web-public:stable
ports:
- 9002:8080
networks:
Expand All @@ -101,7 +101,7 @@ services:
condition: service_started

idam-web-admin:
image: hmctspublic.azurecr.io/idam/web-admin:stable
image: hmctsprod.azurecr.io/idam/web-admin:stable
ports:
- 8082:8080
networks:
Expand Down
2 changes: 1 addition & 1 deletion compose/ts-translation-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
- http_proxy
- https_proxy
- no_proxy
image: "${TS_TRANSLATION_SERVICE_USE_LOCAL-hmctspublic.azurecr.io/}ts/translation-service:${TS_TRANSLATION_SERVICE_TAG:-latest}"
image: "${TS_TRANSLATION_SERVICE_USE_LOCAL-hmctsprod.azurecr.io/}ts/translation-service:${TS_TRANSLATION_SERVICE_TAG:-latest}"
container_name: translation-service
environment:
TS_TRANSLATION_SERVICE_DB_HOST: ccd-shared-database
Expand Down
2 changes: 1 addition & 1 deletion compose/xui-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

services:
xui-manage-cases:
image: "${XUI_MANAGE_CASES_USE_LOCAL-hmctspublic.azurecr.io/}xui/webapp:${XUI_MANAGE_CASES_TAG:-latest}"
image: "${XUI_MANAGE_CASES_USE_LOCAL-hmctsprod.azurecr.io/}xui/webapp:${XUI_MANAGE_CASES_TAG:-latest}"
container_name: xui-manage-cases
environment:
FEATURE_APP_INSIGHTS_ENABLED: "true"
Expand Down