Fix canary publishing (#1093)

* ci: fix custom docker tag

* ci: use new env file

* ci: use outputs from previous job

* ci: fix headers of jobs

* ci: inherit canary tag from builder

.github/workflows/publish-canary.yml

@@ -21,6 +21,7 @@ jobs:
       message-relayer: ${{ steps.packages.outputs.message-relayer }}
       data-transport-layer: ${{ steps.packages.outputs.data-transport-layer }}
       contracts: ${{ steps.packages.outputs.contracts }}
+      canary-docker-tag: ${{ steps.docker-image-name.outputs.canary-docker-tag }}
 
     steps:
       - name: Check out source code
@@ -72,9 +73,9 @@ jobs:
           node ops/scripts/ci-versions.js ${{ toJSON(steps.changesets.outputs.publishedPackages) }}
 
       - name: Docker Image Name
-        id: docker_image_name
+        id: docker-image-name
         run: |
-          if [ -z "${CUSTOM_IMAGE_NAME}" ]
+          if [ ${CUSTOM_IMAGE_NAME} == '' ]
           then
               echo "::set-output name=canary-docker-tag::${GITHUB_SHA::8}"
           else
@@ -89,7 +90,7 @@ jobs:
   # while also allowing for parallelization (i.e. `l2geth` not depending on `builder`)
   # and all jobs executing in parallel once `builder` is built
   l2geth:
-    name: Publish L2Geth Version ${{ needs.canary-publish.outputs.l2geth }}
+    name: Publish L2Geth Version ${{ needs.canary-publish.outputs.canary-docker-tag }}
     needs: canary-publish
     if: needs.canary-publish.outputs.l2geth != ''
     runs-on: ubuntu-latest
@@ -112,7 +113,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.geth
           push: true
-          tags: ethereumoptimism/l2geth:${{ steps.docker_image_name.outputs.canary-docker-tag }}
+          tags: ethereumoptimism/l2geth:${{ needs.canary-publish.outputs.canary-docker-tag }}
 
   # pushes the base builder image to dockerhub
   builder:
@@ -127,6 +128,8 @@ jobs:
       data-transport-layer: ${{ needs.canary-publish.outputs.data-transport-layer }}
       contracts: ${{ needs.canary-publish.outputs.contracts }}
       integration-tests: ${{ needs.canary-publish.outputs.integration-tests }}
+      canary-docker-tag: ${{ needs.canary-publish.outputs.canary-docker-tag }}
+
 
     steps:
       - name: Checkout
@@ -149,7 +152,7 @@ jobs:
           tags: ethereumoptimism/builder
 
   message-relayer:
-    name: Publish Message Relayer Version ${{ needs.builder.outputs.message-relayer }}
+    name: Publish Message Relayer Version ${{ needs.builder.outputs.canary-docker-tag }}
     needs: builder
     if: needs.builder.outputs.message-relayer != ''
     runs-on: ubuntu-latest
@@ -172,10 +175,10 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.message-relayer
           push: true
-          tags: ethereumoptimism/message-relayer:${{ steps.docker_image_name.outputs.canary-docker-tag }}
+          tags: ethereumoptimism/message-relayer:${{ needs.builder.outputs.canary-docker-tag }}
 
   batch-submitter:
-    name: Publish Batch Submitter Version ${{ needs.builder.outputs.batch-submitter }}
+    name: Publish Batch Submitter Version ${{ needs.builder.outputs.canary-docker-tag }}
     needs: builder
     if: needs.builder.outputs.batch-submitter != ''
     runs-on: ubuntu-latest
@@ -198,10 +201,10 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.batch-submitter
           push: true
-          tags: ethereumoptimism/batch-submitter:${{ steps.docker_image_name.outputs.canary-docker-tag }}
+          tags: ethereumoptimism/batch-submitter:${{ needs.builder.outputs.canary-docker-tag }}
 
   data-transport-layer:
-    name: Publish Data Transport Layer Version ${{ needs.builder.outputs.data-transport-layer }}
+    name: Publish Data Transport Layer Version ${{ needs.builder.outputs.canary-docker-tag }}
     needs: builder
     if: needs.builder.outputs.data-transport-layer != ''
     runs-on: ubuntu-latest
@@ -224,10 +227,10 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.data-transport-layer
           push: true
-          tags: ethereumoptimism/data-transport-layer:${{ steps.docker_image_name.outputs.canary-docker-tag }}
+          tags: ethereumoptimism/data-transport-layer:${{ needs.builder.outputs.canary-docker-tag }}
 
   contracts:
-    name: Publish Deployer Version ${{ needs.builder.outputs.contracts }}
+    name: Publish Deployer Version ${{ needs.builder.outputs.canary-docker-tag }}
     needs: builder
     if: needs.builder.outputs.contracts != ''
     runs-on: ubuntu-latest
@@ -250,7 +253,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.deployer
           push: true
-          tags: ethereumoptimism/deployer:${{ steps.docker_image_name.outputs.canary-docker-tag }}
+          tags: ethereumoptimism/deployer:${{ needs.builder.outputs.canary-docker-tag }}
 
   integration_tests:
     name: Publish Integration tests ${{ needs.builder.outputs.integration-tests }}
@@ -276,4 +279,4 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.integration-tests
           push: true
-          tags: ethereumoptimism/integration-tests:${{ steps.docker_image_name.outputs.canary-docker-tag }}
+          tags: ethereumoptimism/integration-tests:${{ needs.builder.outputs.canary-docker-tag }}