diff --git a/Dockerfile b/Dockerfile index 6fc9cab769..502fb7f05a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom" ARG APP_INSIGHTS_AGENT_VERSION=3.7.7 ARG PLATFORM="" -FROM hmctspublic.azurecr.io/base/java${PLATFORM}:21-distroless +FROM hmctsprod.azurecr.io/base/java${PLATFORM}:21-distroless USER hmcts LABEL maintainer="https://github.com/hmcts/ccd-data-store-api" diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 782a1cbc5e..148f792234 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -112,8 +112,8 @@ env.BEFTA_RETRY_MAX_ATTEMPTS = "3" env.BEFTA_RETRY_STATUS_CODES = "500,502,503,504" env.BEFTA_RETRY_MAX_DELAY = "1000" env.BEFTA_RETRY_NON_RETRYABLE_HTTP_METHODS = "POST,PUT" -// Prevent Docker hub rate limit errors by ensuring that testcontainers uses images from hmctspublic ACR -env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctspublic.azurecr.io/imported/" +// Prevent Docker hub rate limit errors by ensuring that testcontainers uses images from hmctsprod ACR +env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctsprod.azurecr.io/imported/" withPipeline(type, product, component) { onMaster { diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly index 3812977cde..60d57c4334 100644 --- a/Jenkinsfile_nightly +++ b/Jenkinsfile_nightly @@ -81,8 +81,8 @@ def vaultOverrides = [ // vars needed for functional tests // Assume a feature build branched off 'develop', with dependencies develop-to-develop. env.TEST_URL = "http://ccd-data-store-api-aat.service.core-compute-aat.internal" -// Prevent Docker hub rate limit errors by ensuring that testcontainers uses images from hmctspublic ACR -env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctspublic.azurecr.io/imported/" +// Prevent Docker hub rate limit errors by ensuring that testcontainers uses images from hmctsprod ACR +env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctsprod.azurecr.io/imported/" // Other env variables needed for BEFTA. env.BEFTA_S2S_CLIENT_ID = "ccd_gw" diff --git a/acb.tpl.yaml b/acb.tpl.yaml index 730b380a3d..45db69e490 100644 --- a/acb.tpl.yaml +++ b/acb.tpl.yaml @@ -1,14 +1,14 @@ version: 1.0-preview-1 steps: - id: pull-base-image-amd64 - cmd: docker pull --platform linux/amd64 hmctspublic.azurecr.io/base/java:21-distroless && docker tag hmctspublic.azurecr.io/base/java:21-distroless hmctspublic.azurecr.io/base/java/linux/amd64:21-distroless + cmd: docker pull --platform linux/amd64 hmctsprod.azurecr.io/base/java:21-distroless && docker tag hmctsprod.azurecr.io/base/java:21-distroless hmctsprod.azurecr.io/base/java/linux/amd64:21-distroless when: ["-"] retries: 3 retryDelay: 5 - id: runtime-amd64 build: > - -t {{.Run.Registry}}/{{CI_IMAGE_TAG}}-amd64 + -t hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}-amd64 --build-arg PLATFORM=/linux/amd64 --platform linux/amd64 . @@ -18,7 +18,7 @@ steps: retryDelay: 5 - id: pull-base-image-arm64 - cmd: docker pull --platform linux/arm64 hmctspublic.azurecr.io/base/java:21-distroless && docker tag hmctspublic.azurecr.io/base/java:21-distroless hmctspublic.azurecr.io/base/java/linux/arm64:21-distroless + cmd: docker pull --platform linux/arm64 hmctsprod.azurecr.io/base/java:21-distroless && docker tag hmctsprod.azurecr.io/base/java:21-distroless hmctsprod.azurecr.io/base/java/linux/arm64:21-distroless when: - pull-base-image-amd64 retries: 3 @@ -26,7 +26,7 @@ steps: - id: runtime-arm64 build: > - -t {{.Run.Registry}}/{{CI_IMAGE_TAG}}-arm64 + -t hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}-arm64 --build-arg PLATFORM=/linux/arm64 --platform linux/arm64/v8 . @@ -37,8 +37,8 @@ steps: - id: push-images push: - - "{{.Run.Registry}}/{{CI_IMAGE_TAG}}-amd64" - - "{{.Run.Registry}}/{{CI_IMAGE_TAG}}-arm64" + - "hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}-amd64" + - "hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}-arm64" when: - runtime-amd64 - runtime-arm64 @@ -46,14 +46,14 @@ steps: retryDelay: 5 - id: manifest-create - cmd: docker manifest create {{.Run.Registry}}/{{CI_IMAGE_TAG}} {{.Run.Registry}}/{{CI_IMAGE_TAG}}-amd64 {{.Run.Registry}}/{{CI_IMAGE_TAG}}-arm64 + cmd: docker manifest create hmctsprod.azurecr.io/{{CI_IMAGE_TAG}} hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}-amd64 hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}-arm64 when: - push-images retries: 3 retryDelay: 5 - id: manifest-push - cmd: docker manifest push --purge {{.Run.Registry}}/{{CI_IMAGE_TAG}} + cmd: docker manifest push --purge hmctsprod.azurecr.io/{{CI_IMAGE_TAG}} when: - manifest-create retries: 3 diff --git a/charts/ccd-data-store-api/Chart.yaml b/charts/ccd-data-store-api/Chart.yaml index 88984aaf76..69dc755e86 100644 --- a/charts/ccd-data-store-api/Chart.yaml +++ b/charts/ccd-data-store-api/Chart.yaml @@ -2,14 +2,14 @@ description: Helm chart for the HMCTS CCD Data Store name: ccd-data-store-api apiVersion: v2 home: https://github.com/hmcts/ccd-data-store-api -version: 2.0.37 +version: 2.0.38 maintainers: - name: HMCTS CCD Dev Team email: ccd-devops@HMCTS.NET dependencies: - name: java version: 5.3.0 - repository: 'oci://hmctspublic.azurecr.io/helm' + repository: 'oci://hmctsprod.azurecr.io/helm' - name: elasticsearch version: 7.17.3 repository: 'https://helm.elastic.co' @@ -20,5 +20,5 @@ dependencies: condition: elastic.enabled - name: ccd version: 9.2.2 - repository: 'oci://hmctspublic.azurecr.io/helm' + repository: 'oci://hmctsprod.azurecr.io/helm' condition: ccd.enabled diff --git a/charts/ccd-data-store-api/values.preview.template.yaml b/charts/ccd-data-store-api/values.preview.template.yaml index 696373792b..4f3380b099 100644 --- a/charts/ccd-data-store-api/values.preview.template.yaml +++ b/charts/ccd-data-store-api/values.preview.template.yaml @@ -92,7 +92,7 @@ ccd: ccd-definition-store-api: java: ingressHost: ccd-definition-store-${SERVICE_FQDN} - image: hmctspublic.azurecr.io/ccd/definition-store-api:latest + image: hmctsprod.azurecr.io/ccd/definition-store-api:latest imagePullPolicy: Always devmemoryRequests: 2048Mi devcpuRequests: 2000m @@ -116,7 +116,7 @@ ccd: ccd-user-profile-api: java: ingressHost: ccd-user-profile-api-${SERVICE_FQDN} - image: hmctspublic.azurecr.io/ccd/user-profile-api:latest + image: hmctsprod.azurecr.io/ccd/user-profile-api:latest imagePullPolicy: Always environment: USER_PROFILE_DB_HOST: "{{ .Release.Name }}-postgresql" @@ -178,13 +178,13 @@ elasticsearch: # paths: # - path: / logstash: - image: "hmctspublic.azurecr.io/imported/logstash/logstash" + image: "hmctsprod.azurecr.io/imported/logstash/logstash" imageTag: "7.16.1" imagePullPolicy: "IfNotPresent" logstashJavaOpts: "-Xmx1g -Xms512M" extraInitContainers: | - name: download-postgres-jdbc - image: hmctspublic.azurecr.io/curl:7.70.0 + image: hmctsprod.azurecr.io/curl:7.70.0 command: ['curl', '-L', 'https://jdbc.postgresql.org/download/postgresql-42.2.18.jar', '-o', '/logstash-lib/postgresql.jar'] volumeMounts: - name: logstash-lib diff --git a/charts/ccd-data-store-api/values.yaml b/charts/ccd-data-store-api/values.yaml index c2ae820393..9bb268fecd 100644 --- a/charts/ccd-data-store-api/values.yaml +++ b/charts/ccd-data-store-api/values.yaml @@ -4,7 +4,7 @@ ccd: enabled: false java: - image: 'hmctspublic.azurecr.io/ccd/data-store-api:latest' + image: 'hmctsprod.azurecr.io/ccd/data-store-api:latest' ingressHost: ccd-data-store-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal applicationPort: 4452 aadIdentityName: ccd