diff --git a/.github/actions/combine-build/action.yml b/.github/actions/combine-build/action.yml index 6f2af8e988..b67f8f875a 100644 --- a/.github/actions/combine-build/action.yml +++ b/.github/actions/combine-build/action.yml @@ -5,7 +5,10 @@ inputs: description: "Docker Image Registry" required: true image_registry_alias: - description: "Custom or default alias for AWS Public ECR registries. Blank for AWS ECR Private registries." + description: > + Custom or default alias for AWS Public ECR registries. Blank for AWS ECR Private registries. + If the image_registry_alias is specified, include the '/' at the beginning of the string, + e.g. /thecombine required: false default: "" aws_access_key_id: diff --git a/.github/actions/combine-deploy-update/action.yml b/.github/actions/combine-deploy-update/action.yml index 646b52b7a5..0f3c381598 100644 --- a/.github/actions/combine-deploy-update/action.yml +++ b/.github/actions/combine-deploy-update/action.yml @@ -1,9 +1,16 @@ name: "Combine Deploy Updates" description: "Deploy updated images for The Combine to the Kubernetes cluster" inputs: - image_repo: - description: "Docker Image Repository" + image_registry: + description: "Docker Image Registry" required: true + image_registry_alias: + description: > + Custom or default alias for AWS Public ECR registries. Blank for AWS ECR Private registries. + If the image_registry_alias is specified, include the '/' at the beginning of the string, + e.g. /thecombine + required: false + default: "" image_tag: description: "Image Tag for docker images" required: true @@ -29,22 +36,22 @@ runs: - name: Update frontend run: kubectl --context ${{ inputs.kube_context }} set image deployment/frontend - frontend="${{ inputs.image_repo }}/combine_frontend:${{ inputs.image_tag }}" + frontend="${{ inputs.image_registry }}${{ inputs.image_registry_alias}}/combine_frontend:${{ inputs.image_tag }}" shell: bash - name: Update backend run: kubectl --context ${{ inputs.kube_context }} set image deployment/backend - backend="${{ inputs.image_repo }}/combine_backend:${{ inputs.image_tag }}" + backend="${{ inputs.image_registry }}${{ inputs.image_registry_alias}}/combine_backend:${{ inputs.image_tag }}" shell: bash - name: Update maintenance run: kubectl --context ${{ inputs.kube_context }} set image deployment/maintenance - maintenance="${{ inputs.image_repo }}/combine_maint:${{ inputs.image_tag }}" + maintenance="${{ inputs.image_registry }}${{ inputs.image_registry_alias}}/combine_maint:${{ inputs.image_tag }}" shell: bash - name: Update Cert Proxy Server if: ${{ inputs.update_cert_proxy == 'true' }} run: kubectl --context ${{ inputs.kube_context }} --namespace combine-cert-proxy set image deployment/combine-cert-proxy - combine-cert-proxy="${{ inputs.image_repo }}/combine_maint:${{ inputs.image_tag }}" + combine-cert-proxy="${{ inputs.image_registry }}/combine_maint:${{ inputs.image_tag }}" shell: bash