diff --git a/.github/workflows/actions/deploy/action.yaml b/.github/workflows/actions/deploy/action.yaml index 519c58e5..2091ade6 100644 --- a/.github/workflows/actions/deploy/action.yaml +++ b/.github/workflows/actions/deploy/action.yaml @@ -69,14 +69,14 @@ runs: run: | docker pull ${{ inputs.github_image_name }}@${{ inputs.image_digest }} docker tag ${{ inputs.github_image_name }}@${{ inputs.image_digest }} ${{ inputs.github_image_name }}:${{ inputs.environment }} - docker push ${{ inputs.github_image_name }}/${{ matrix.service }}:${{ inputs.environment }} + docker push ${{ inputs.github_image_name }}${{ matrix.service }}:${{ inputs.environment }} - name: Tag the image in the OpenShift container registry as ${{ inputs.environment }} shell: bash run: | docker pull ${{ inputs.github_image_name }}@${{ inputs.image_digest }} docker tag ${{ inputs.github_image_name }}@${{ inputs.image_digest }} ${{ inputs.openshift_image_name }}:${{ inputs.environment }} - docker push ${{ inputs.openshift_image_name}}/${{ matrix.service }}:${{ inputs.environment }} + docker push ${{ inputs.openshift_image_name}}${{ matrix.service }}:${{ inputs.environment }} - name: Trigger OpenShift rollout shell: bash diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 31326693..63923dda 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -118,9 +118,9 @@ jobs: with: environment: ${{ env.ENVIRONMENT }} ghcr_token: ${{ secrets.GITHUB_TOKEN }} - github_image_name: ${{ env.GITHUB_IMAGE_REPO }}/${{ matrix.service }} + github_image_name: ${{ env.GITHUB_IMAGE_REPO }}${{ matrix.service }} image_digest: ${{ needs.build.outputs.image_digest }} - openshift_image_name: ${{ env.OPENSHIFT_IMAGE_REPO }}/${{ matrix.service }} + openshift_image_name: ${{ env.OPENSHIFT_IMAGE_REPO }}${{ matrix.service }} openshift_server_url: ${{ vars.OPENSHIFT_SERVER_URL }} namespace: ${{ vars.NAMESPACE }} deployment_configuration: ${{ matrix.service }}