chore: docker workflow refactor

.github/workflows/ci_release.yml

@@ -26,14 +26,31 @@
   lint:
     uses: ./.github/workflows/lint.yml
 
+  docker:
+    uses: ./.github/workflows/docker.yml
+    secrets: inherit
+    permissions:
+      packages: write
+    with:
+      # tag with the pr in the format of pr-1234 or the tag / branch if it is not a PR.
+      image-tag: ${{ github.event.pull_request.number && format('pr-{0}', github.event.pull_request.number) || github.ref_name }}
+
   test:
     uses: ./.github/workflows/test.yml
     secrets: inherit
     with:
       # tag with the pr in the format of pr-1234 or the tag / branch if it is not a PR.
       image-tag: ${{ github.event.pull_request.number && format('pr-{0}', github.event.pull_request.number) || github.ref_name }}
 
+  docker-tests:
+    needs: docker
+    uses: ./.github/workflows/docker-tests.yml
+    secrets: inherit
+    with:
+      # tag with the pr in the format of pr-1234 or the tag / branch if it is not a PR.
+      image-tag: ${{ github.event.pull_request.number && format('pr-{0}', github.event.pull_request.number) || github.ref_name }}
+
   proto:
     uses: ./.github/workflows/proto.yml
 
   # branch_name trims ref/heads/ from github.ref to access a clean branch name
@@ -49,7 +66,7 @@
 
   # Make a release if this is a manually trigger job, i.e. workflow_dispatch
   release:
-    needs: [lint, test, proto, branch_name]
+    needs: [lint, docker, test, docker-tests, proto, branch_name]
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'workflow_dispatch' }}
     permissions: "write-all"

.github/workflows/docker-tests.yml

@@ -0,0 +1,46 @@
+# Docker E2E Tests workflow
+# This workflow runs tests that require Docker images to be built first
+name: Docker E2E Tests
+on:
+  workflow_call:
+    inputs:
+      image-tag:
+        required: true
+        type: string
+  workflow_dispatch:
+    inputs:
+      image-tag:
+        description: 'Docker image tag to use for tests (e.g., v1.2.3, pr-123, sha-abc123)'
+        required: true
+        type: string
+
+jobs:
+  docker-tests:
+    name: Docker E2E Tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: set up go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: ./test/docker-e2e/go.mod
+      - name: Run Docker E2E Tests
+        run: make test-docker-e2e
+        env:
+          EV_NODE_IMAGE_REPO: ghcr.io/${{ github.repository }}
+          EV_NODE_IMAGE_TAG: ${{ inputs.image-tag }}
+
+  docker-upgrade-tests:
+    name: Docker Upgrade E2E Tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: set up go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: ./test/docker-e2e/go.mod
+      - name: Run Docker Upgrade E2E Tests
+        run: make test-docker-upgrade-e2e
+        env:
+          EVM_SINGLE_IMAGE_REPO: ghcr.io/${{ github.repository_owner }}/ev-node-evm-single
+          EVM_SINGLE_NODE_IMAGE_TAG: ${{ inputs.image-tag }}

.github/workflows/docker.yml

@@ -0,0 +1,75 @@
+# Docker Images Build workflow
+# This workflow builds and pushes Docker images to GHCR
+name: Build Docker Images
+on:
+  workflow_call:
+    inputs:
+      image-tag:
+        required: true
+        type: string
+        description: 'Docker image tag (e.g., v1.2.3, pr-123, sha-abc123)'
+  workflow_dispatch:
+    inputs:
+      image-tag:
+        description: 'Docker image tag to build (e.g., v1.2.3, sha-abc123)'
+        required: true
+        type: string
+  push:
+    tags:
+      - 'v*'
+  release:
+    types: [published]
+
+jobs:
+  build-images:
+    name: Build ${{ matrix.image-name }}
+    # skip building images for merge groups as they are already built on PRs and main
+    if: github.event_name != 'merge_group'
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    strategy:
+      matrix:
+        include:
+          - image-name: ev-node
+            dockerfile: Dockerfile
+            context: .
+          - image-name: ev-node-evm-single
+            dockerfile: apps/evm/single/Dockerfile
+            context: .
+          - image-name: local-da
+            dockerfile: da/cmd/local-da/Dockerfile
+            context: .
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Determine image tag
+        id: tag
+        run: |
+          if [ "${{ github.event_name }}" = "release" ] || [ "${{ github.event_name }}" = "push" ]; then
+            echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          elif [ "${{ github.event_name }}" = "pull_request" ]; then
+            echo "tag=pr-${{ github.event.pull_request.number }}" >> $GITHUB_OUTPUT
+          else
+            echo "tag=${{ inputs.image-tag }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build and push ${{ matrix.image-name }} Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: ${{ matrix.context }}
+          file: ${{ matrix.dockerfile }}
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.image-name }}:${{ steps.tag.outputs.tag }}

.github/workflows/test.yml

@@ -10,132 +10,11 @@ on:
   workflow_dispatch:
     inputs:
       image-tag:
-        description: 'Docker image tag to build (e.g., v1.2.3, sha-abc123)'
+        description: 'Docker image tag to use for tests (e.g., v1.2.3, sha-abc123)'
         required: true
         type: string
 
 jobs:
-  build-ev-node-image:
-    name: Build ev-node Docker Image
-    # skip building images for merge groups as they are already built on PRs and main
-    if: github.event_name != 'merge_group'
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push ev-node Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: ghcr.io/${{ github.repository_owner }}/ev-node:${{ inputs.image-tag }}
-
-  build-ev-node-evm-single-image:
-    name: Build ev-node EVM Single Docker Image
-    # skip building images for merge groups as they are already built on PRs and main
-    if: github.event_name != 'merge_group'
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push ev-node-evm-single Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: apps/evm/single/Dockerfile
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: ghcr.io/${{ github.repository_owner }}/ev-node-evm-single:${{ inputs.image-tag }}
-
-  build-local-da-image:
-    name: Build local-da Docker Image
-    # skip building images for merge groups as they are already built on PRs and main
-    if: github.event_name != 'merge_group'
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push local-da Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: da/cmd/local-da/Dockerfile
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: ghcr.io/${{ github.repository_owner }}/local-da:${{ inputs.image-tag }}
-
-  docker-tests:
-    name: Docker E2E Tests
-    needs: build-ev-node-image
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - name: set up go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: ./test/docker-e2e/go.mod
-      - name: Run Docker E2E Tests
-        run: make test-docker-e2e
-        env:
-          EV_NODE_IMAGE_REPO: ghcr.io/${{ github.repository }}
-          EV_NODE_IMAGE_TAG: ${{ inputs.image-tag }}
-
-  docker-upgrade-tests:
-    name: Docker Upgrade E2E Tests
-    needs: build-ev-node-evm-single-image
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - name: set up go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: ./test/docker-e2e/go.mod
-      - name: Run Docker Upgrade E2E Tests
-        run: make test-docker-upgrade-e2e
-        env:
-          EVM_SINGLE_IMAGE_REPO: ghcr.io/${{ github.repository_owner }}/ev-node-evm-single
-          EVM_SINGLE_NODE_IMAGE_TAG: ${{ inputs.image-tag }}
-
   build_all-apps:
     name: Build All ev-node Binaries
     runs-on: ubuntu-latest