From d63cf0efeb38293ed4045f425f776abddc6d0cb4 Mon Sep 17 00:00:00 2001 From: Ben Lang <132359359+lang-ben@users.noreply.github.com> Date: Wed, 25 Mar 2026 13:46:53 +0000 Subject: [PATCH] CCD-7417 : swap acr hmctspublic & hmctsprivate to hmctsprod --- .env | 2 +- ccd | 28 ++++++++++++++++++----- compose/backend.yml | 12 +++++----- compose/case-disposer.yml | 2 +- compose/case-document-am.yml | 2 +- compose/case-payment-orders.yml | 2 +- compose/ccd-next-hearing-date-updater.yml | 2 +- compose/dm-store.yml | 2 +- compose/frontend.yml | 4 ++-- compose/hearings.yml | 6 ++--- compose/idam-sim.yml | 2 +- compose/message-publisher.yml | 2 +- compose/operational.yml | 2 +- compose/others.yml | 2 +- compose/sidam.yml | 12 +++++----- compose/ts-translation-service.yml | 2 +- compose/xui-frontend.yml | 2 +- 17 files changed, 51 insertions(+), 35 deletions(-) diff --git a/.env b/.env index 9258e34..feb4234 100644 --- a/.env +++ b/.env @@ -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 diff --git a/ccd b/ccd index e421782..b5d82f1 100755 --- a/ccd +++ b/ccd @@ -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() { @@ -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 @@ -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 @@ -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 } diff --git a/compose/backend.yml b/compose/backend.yml index 0f75630..02582be 100644 --- a/compose/backend.yml +++ b/compose/backend.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: diff --git a/compose/case-disposer.yml b/compose/case-disposer.yml index b66ac4a..222301e 100644 --- a/compose/case-disposer.yml +++ b/compose/case-disposer.yml @@ -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 diff --git a/compose/case-document-am.yml b/compose/case-document-am.yml index bb3dd27..78a13b7 100644 --- a/compose/case-document-am.yml +++ b/compose/case-document-am.yml @@ -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 diff --git a/compose/case-payment-orders.yml b/compose/case-payment-orders.yml index 42db9dc..c8c24ad 100644 --- a/compose/case-payment-orders.yml +++ b/compose/case-payment-orders.yml @@ -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 diff --git a/compose/ccd-next-hearing-date-updater.yml b/compose/ccd-next-hearing-date-updater.yml index dcd638a..aa5acd5 100644 --- a/compose/ccd-next-hearing-date-updater.yml +++ b/compose/ccd-next-hearing-date-updater.yml @@ -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 diff --git a/compose/dm-store.yml b/compose/dm-store.yml index 2a925d0..7d8eccd 100644 --- a/compose/dm-store.yml +++ b/compose/dm-store.yml @@ -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: diff --git a/compose/frontend.yml b/compose/frontend.yml index b385ab9..0e29999 100644 --- a/compose/frontend.yml +++ b/compose/frontend.yml @@ -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" @@ -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}" diff --git a/compose/hearings.yml b/compose/hearings.yml index cf44a28..22b2b12 100644 --- a/compose/hearings.yml +++ b/compose/hearings.yml @@ -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 @@ -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 @@ -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 diff --git a/compose/idam-sim.yml b/compose/idam-sim.yml index 33d6598..b728fa5 100644 --- a/compose/idam-sim.yml +++ b/compose/idam-sim.yml @@ -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" diff --git a/compose/message-publisher.yml b/compose/message-publisher.yml index dfe848f..7d3c95a 100644 --- a/compose/message-publisher.yml +++ b/compose/message-publisher.yml @@ -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 diff --git a/compose/operational.yml b/compose/operational.yml index 38a4afa..00ba992 100644 --- a/compose/operational.yml +++ b/compose/operational.yml @@ -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 diff --git a/compose/others.yml b/compose/others.yml index 42c389e..59c738c 100644 --- a/compose/others.yml +++ b/compose/others.yml @@ -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}" diff --git a/compose/sidam.yml b/compose/sidam.yml index 2d99663..464184c 100644 --- a/compose/sidam.yml +++ b/compose/sidam.yml @@ -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 @@ -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 @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/compose/ts-translation-service.yml b/compose/ts-translation-service.yml index 740eceb..d14719e 100644 --- a/compose/ts-translation-service.yml +++ b/compose/ts-translation-service.yml @@ -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 diff --git a/compose/xui-frontend.yml b/compose/xui-frontend.yml index b293e6c..f1f2301 100644 --- a/compose/xui-frontend.yml +++ b/compose/xui-frontend.yml @@ -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"