Merge branch 'master' into feat/xatu-sidecar

Author: barnabasbusa

.github/workflows/build-push-syncoor.yml

@@ -0,0 +1,109 @@
+name: Build syncoor docker image
+
+on:
+  workflow_dispatch:
+    inputs:
+      repository:
+        description: The source syncoor repository to build from
+        default: ethpandaops/syncoor
+        type: string
+        required: true
+      ref:
+        description: The branch, tag or SHA to checkout and build from
+        default: master
+        type: string
+        required: true
+      docker_tag:
+        description: Override target docker tag (defaults to the above source ref if left blank)
+        type: string
+        required: false
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      platforms: ${{ steps.setup.outputs.platforms }}
+      target_tag: ${{ steps.tag.outputs.docker_tag }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Prepare Matrix
+        id: setup
+        uses: ./.github/actions/prepare
+        with:
+          client: 'syncoor'
+      - name: Generate target tag
+        id: tag
+        uses: ./.github/actions/docker-tag
+        with:
+          input: ${{ inputs.docker_tag || inputs.ref }}
+  deploy:
+    needs:
+      - prepare
+    runs-on: ${{ matrix.runner }}
+    continue-on-error: true
+    strategy:
+      matrix:
+        include: ${{fromJson(needs.prepare.outputs.platforms)}}
+    outputs:
+      git_commit_hash: ${{ steps.set_output.outputs.git_commit_hash }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: ./.github/actions/install-deps
+        with:
+          repository: ${{ inputs.repository }}
+      - uses: ./.github/actions/deploy
+        id: deploy
+        with:
+          source_repository: ${{ inputs.repository }}
+          source_ref: ${{ inputs.ref }}
+          target_tag: ${{ needs.prepare.outputs.target_tag }}-${{ matrix.slug }}
+          target_repository: ethpandaops/syncoor
+          platform: ${{ matrix.platform }}
+
+          DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
+          DOCKER_PASSWORD: "${{ secrets.DOCKER_PASSWORD }}"
+          MACOS_PASSWORD: "${{ secrets.MACOS_PASSWORD }}"
+          GOPROXY: "${{ vars.GOPROXY }}"
+          HARBOR_USERNAME: "${{ vars.HARBOR_USERNAME }}"
+          HARBOR_PASSWORD: "${{ secrets.HARBOR_PASSWORD }}"
+          harbor_registry: ${{ vars.HARBOR_REGISTRY }}
+
+      # This step captures the git commit hash from the deploy action for job output
+      - name: Set job output
+        id: set_output
+        run: echo "git_commit_hash=${{ steps.deploy.outputs.git_commit_hash }}" >> $GITHUB_OUTPUT
+        shell: bash
+  manifest:
+    needs:
+      - prepare
+      - deploy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: ./.github/actions/manifest
+        with:
+          source_repository: ${{ inputs.repository }}
+          source_ref: ${{ inputs.ref }}
+          target_tag: ${{ needs.prepare.outputs.target_tag }}
+          target_repository: ethpandaops/syncoor
+          platforms: ${{ needs.prepare.outputs.platforms }}
+          harbor_registry: ${{ vars.HARBOR_REGISTRY }}
+          HARBOR_USERNAME: "${{ vars.HARBOR_USERNAME }}"
+          HARBOR_PASSWORD: "${{ secrets.HARBOR_PASSWORD }}"
+          git_commit_hash: ${{ needs.deploy.outputs.git_commit_hash }}
+          DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
+          DOCKER_PASSWORD: "${{ secrets.DOCKER_PASSWORD }}"
+  notify:
+    name: Discord Notification
+    runs-on: ubuntu-latest
+    needs:
+      - prepare
+      - deploy
+      - manifest
+    if: failure()
+    steps:
+      - name: Notify
+        uses: nobrayner/discord-webhook@1766a33bf571acdcc0678f00da4fb83aad01ebc7 # v1
+        with:
+          github-token: ${{ secrets.github_token }}
+          discord-webhook: ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/scheduled.yml

@@ -16,7 +16,7 @@ jobs:
       configs: ${{ steps.repo_check.outputs.configs }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: mikefarah/yq@b534aa9ee5d38001fba3cd8fe254a037e4847b37 # v4.45.4
+      - uses: mikefarah/yq@f03c9dc599c37bfcaf533427211d05e51e6fee64 # v4.47.1
       - name: Set up Python
         uses: actions/setup-python@v5
         with:

.github/workflows/vet.yml

@@ -37,7 +37,7 @@ jobs:
         run: pip install PyYAML
       - name: Generate config.yaml
         run: python3 generate_config.py
-      - uses: mikefarah/yq@b534aa9ee5d38001fba3cd8fe254a037e4847b37 # v4.45.4
+      - uses: mikefarah/yq@f03c9dc599c37bfcaf533427211d05e51e6fee64 # v4.47.1
       - name: duplicate repository tag check
         run: |
           OUTPUT=$(yq 'group_by(.target.repository + ":" + .target.tag) | map(select(length>1))' config.yaml)

README.md

@@ -32,6 +32,7 @@ Run the *Build **tooling*** workflow;
 - [Build ethereum-genesis-generator](https://github.com/ethpandaops/eth-client-docker-image-builder/actions/workflows/build-push-genesis-generator.yml) [[source](https://github.com/ethpandaops/ethereum-genesis-generator)]
 - [Build mev-rs](https://github.com/ethpandaops/eth-client-docker-image-builder/actions/workflows/build-push-mev-rs.yml) [[source](https://github.com/ralexstokes/mev-rs)]
 - [Build reth-rbuilder](https://github.com/ethpandaops/eth-client-docker-image-builder/actions/workflows/build-push-reth-rbuilder.yml) [[source](https://github.com/flashbots/rbuilder)]
+- [Build Syncoor](https://github.com/ethpandaops/eth-client-docker-image-builder/actions/workflows/build-push-syncoor.yml) [[source](https://github.com/ethpandaops/syncoor)]
 
 ## Adding a new image to build on schedule
 

branches.yaml

@@ -202,3 +202,7 @@ eth-das-guardian:
 # Commented out in config.yaml
 # goevmlab:
 #   branches: ["master"]
+
+syncoor:
+  branches:
+    - master

generate_config.py

@@ -34,7 +34,8 @@
     'mev-boost': 'flashbots/mev-boost',
     'mev-boost-relay': 'flashbots/mev-boost-relay',
     'goevmlab': 'holiman/goevmlab',
-    'eth-das-guardian': 'probe-lab/eth-das-guardian'
+    'eth-das-guardian': 'probe-lab/eth-das-guardian',
+    'syncoor': 'ethpandaops/syncoor'
     # Add more defaults as needed
 }
 

platforms.yaml

@@ -96,3 +96,6 @@ ethrex:
 eth-das-guardian:
   - linux/amd64
   - linux/arm64
+syncoor:
+  - linux/amd64
+  - linux/arm64