From 45d370e9258e40620270432d223114e23e243203 Mon Sep 17 00:00:00 2001 From: Gwyn Date: Sat, 1 Jun 2024 19:46:39 -0600 Subject: [PATCH] Cannot pass the string 'playtechnique' into a job output. This is because it's also my docker hub username. Go figure. --- .github/workflows/publish_website_docker_image.yaml | 6 +----- .github/workflows/release_website.yaml | 7 ++++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish_website_docker_image.yaml b/.github/workflows/publish_website_docker_image.yaml index 3b4c4e2..2391cf2 100644 --- a/.github/workflows/publish_website_docker_image.yaml +++ b/.github/workflows/publish_website_docker_image.yaml @@ -32,12 +32,8 @@ jobs: id: set-docker-image run: | echo ${{ env.DOCKERIMAGE }} - echo "dockerimage=${{ env.DOCKERIMAGE }}" >> ${GITHUB_OUTPUT} - - - uses: actions/checkout@v4 release-to-production: uses: ./.github/workflows/release_website.yaml - needs: build with: - docker-image: ${{needs.build.outputs.dockerimage}} + docker-image-tag: ${{ github.run_number }} diff --git a/.github/workflows/release_website.yaml b/.github/workflows/release_website.yaml index ad1dd14..cbf9f1d 100644 --- a/.github/workflows/release_website.yaml +++ b/.github/workflows/release_website.yaml @@ -6,10 +6,11 @@ on: - 'website/k8s-manifests/overlays/**' workflow_call: inputs: - docker-image: - description: 'Docker image plus tag to udpate to' + docker-image-tag: + description: 'Docker tag to udpate to' required: true type: string + jobs: update-container-version-patch: runs-on: ubuntu-latest @@ -26,7 +27,7 @@ jobs: - name: edit file run: | - yq e '.spec.template.spec.containers[0].image = "${{ inputs.docker-image }}"' -i website-deployment/k8s-manifests/overlays/production/deployment-container-version-patch.yaml + yq e '.spec.template.spec.containers[0].image = "docker.io/playtechnique/website:${{ inputs.docker-image-tag }}"' -i website-deployment/k8s-manifests/overlays/production/deployment-container-version-patch.yaml - name: commit back to github run: |