From 693e4a3b89a997839f2b8eace4d48507a69ccd7e Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sat, 6 Jul 2024 16:20:41 -0400 Subject: [PATCH 01/10] feat: GHCR push support --- .github/workflows/docker-eigenda.yml | 23 +++++++++-------------- .github/workflows/docker.yml | 10 +++++----- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/.github/workflows/docker-eigenda.yml b/.github/workflows/docker-eigenda.yml index 00d1b99be..6a5ad1344 100644 --- a/.github/workflows/docker-eigenda.yml +++ b/.github/workflows/docker-eigenda.yml @@ -20,10 +20,9 @@ jobs: with: submodules: 'recursive' - - # Add support for more platforms with QEMU (optional) - # https://github.com/docker/setup-qemu-action - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -34,23 +33,19 @@ jobs: echo "GIT_TAG=$GIT_TAG" | tee -a $GITHUB_ENV echo "REF_NAME=$(echo ${GIT_TAG:-$GITHUB_REF_NAME} | sed 's/[^a-zA-Z0-9._]/-/g')" | tee -a $GITHUB_ENV - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v4 + - name: Login to GitHub Container Registry + uses: docker/login-action@v2 with: - aws-access-key-id: ${{ secrets.ECR_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.ECR_ACCESS_KEY }} - aws-region: us-west-2 - - - name: Login to Amazon ECR - id: login-ecr - uses: aws-actions/amazon-ecr-login@v2 + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Docker meta id: meta uses: docker/metadata-action@v5 with: images: | - ${{ secrets.ECR_REGISTRY }}/${{ matrix.image }} + ghcr.io/${{ github.repository_owner }}/${{ matrix.image }} tags: | type=ref,event=branch type=ref,event=pr @@ -70,4 +65,4 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} file: ${{ matrix.dockerfile }} - provenance: false + provenance: false \ No newline at end of file diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a01d288be..6b83c06a4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,13 +2,13 @@ name: Docker build CI run-name: Docker build CI triggered from @${{ github.actor }} of ${{ github.head_ref }} on: - workflow_dispatch: - merge_group: - pull_request: push: branches: - - master - - develop + - 'main' + tags: + - 'v*' + pull_request: + branches: [ "develop" ] jobs: docker: From 4c4da1fa51d7dc74984b84201751c97da2fb8c90 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sat, 6 Jul 2024 16:54:35 -0400 Subject: [PATCH 02/10] feat: GHCR push support - update workflows --- .github/workflows/docker-eigenda.yml | 7 ++++++- .github/workflows/docker.yml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-eigenda.yml b/.github/workflows/docker-eigenda.yml index 6a5ad1344..9fee484c6 100644 --- a/.github/workflows/docker-eigenda.yml +++ b/.github/workflows/docker-eigenda.yml @@ -1,7 +1,12 @@ name: Build nitro-eigenda Docker Image on: push: - tags: ['*'] + branches: + - 'main' + tags: + - 'v*' + pull_request: + branches: [ "develop" ] jobs: docker: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6b83c06a4..d3a44f0de 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -8,7 +8,7 @@ on: tags: - 'v*' pull_request: - branches: [ "develop" ] + jobs: docker: From 84402633f83eea591a502d7bbbc60d24ac550d55 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sat, 6 Jul 2024 16:57:51 -0400 Subject: [PATCH 03/10] feat: GHCR push support - add ssh key to docker build workflow --- .github/workflows/docker-eigenda.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-eigenda.yml b/.github/workflows/docker-eigenda.yml index 9fee484c6..6ac7fb7cc 100644 --- a/.github/workflows/docker-eigenda.yml +++ b/.github/workflows/docker-eigenda.yml @@ -24,6 +24,7 @@ jobs: uses: actions/checkout@v4 with: submodules: 'recursive' + ssh-key: ${{ secrets.SSH_KEY }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 From 7750b711d1f739f164f5aad0de7c2c016a6dadc9 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sat, 6 Jul 2024 17:46:51 -0400 Subject: [PATCH 04/10] feat: GHCR push support - update workflow --- .github/workflows/docker-eigenda.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker-eigenda.yml b/.github/workflows/docker-eigenda.yml index 6ac7fb7cc..187121b65 100644 --- a/.github/workflows/docker-eigenda.yml +++ b/.github/workflows/docker-eigenda.yml @@ -1,16 +1,11 @@ name: Build nitro-eigenda Docker Image on: push: - branches: - - 'main' - tags: - - 'v*' - pull_request: - branches: [ "develop" ] + tags: ['*'] jobs: docker: - runs-on: linux-2xl + runs-on: ubuntu-latest strategy: matrix: include: @@ -24,20 +19,14 @@ jobs: uses: actions/checkout@v4 with: submodules: 'recursive' - ssh-key: ${{ secrets.SSH_KEY }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - - name: Prepare Environment Variables - run: | - echo "SHORT_SHA=${GITHUB_SHA::7}" | tee -a $GITHUB_ENV - GIT_TAG=$(git tag --points-at HEAD) - echo "GIT_TAG=$GIT_TAG" | tee -a $GITHUB_ENV - echo "REF_NAME=$(echo ${GIT_TAG:-$GITHUB_REF_NAME} | sed 's/[^a-zA-Z0-9._]/-/g')" | tee -a $GITHUB_ENV + with: + install: true - name: Login to GitHub Container Registry uses: docker/login-action@v2 From c7100ee78e2528fe802213b36caa8cf03fdd2c94 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sat, 6 Jul 2024 17:47:13 -0400 Subject: [PATCH 05/10] feat: GHCR push support - update workflow --- .github/workflows/docker-eigenda.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-eigenda.yml b/.github/workflows/docker-eigenda.yml index 187121b65..6ffd8c4e6 100644 --- a/.github/workflows/docker-eigenda.yml +++ b/.github/workflows/docker-eigenda.yml @@ -1,7 +1,12 @@ name: Build nitro-eigenda Docker Image on: push: - tags: ['*'] + branches: + - 'main' + tags: + - 'v*' + pull_request: + branches: [ "develop" ] jobs: docker: From ccede87a6efca8ba2c29f1fb3f7efa12a55dcd26 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sat, 6 Jul 2024 20:23:50 -0400 Subject: [PATCH 06/10] feat: GHCR push support - update workflow --- .github/workflows/docker-eigenda.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-eigenda.yml b/.github/workflows/docker-eigenda.yml index 6ffd8c4e6..ae4236250 100644 --- a/.github/workflows/docker-eigenda.yml +++ b/.github/workflows/docker-eigenda.yml @@ -24,6 +24,7 @@ jobs: uses: actions/checkout@v4 with: submodules: 'recursive' + ssh-key: ${{ secrets.SSH_KEY }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 From 18677cf55a92fd08aa8fa70daa13c8629d84ee71 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sun, 7 Jul 2024 19:16:35 -0400 Subject: [PATCH 07/10] feat: GHCR push support - use large runner --- .github/workflows/docker-eigenda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-eigenda.yml b/.github/workflows/docker-eigenda.yml index ae4236250..bb8c181b8 100644 --- a/.github/workflows/docker-eigenda.yml +++ b/.github/workflows/docker-eigenda.yml @@ -10,7 +10,7 @@ on: jobs: docker: - runs-on: ubuntu-latest + runs-on: linux-2xl strategy: matrix: include: From 850fa3b9534f1f4c0d22e704e2866995ac80c0aa Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sun, 7 Jul 2024 21:20:19 -0400 Subject: [PATCH 08/10] feat: GHCR push support - update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e463f50a..e697ad6ad 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@

-This is a fork of Arbitrum Nitro developed by [AltLayer](https://altlayer.io/), in a technical partnership with EigenLabs. +This is a fork of Arbitrum Nitro. ## About Arbitrum Nitro From 1654b673a4b06f164688e701b04f8816e70289d4 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sun, 7 Jul 2024 22:05:04 -0400 Subject: [PATCH 09/10] feat: GHCR push support - update workflow requirements to only run docker builds for version releases --- .github/workflows/docker-eigenda.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docker-eigenda.yml b/.github/workflows/docker-eigenda.yml index bb8c181b8..d892507f3 100644 --- a/.github/workflows/docker-eigenda.yml +++ b/.github/workflows/docker-eigenda.yml @@ -1,12 +1,8 @@ name: Build nitro-eigenda Docker Image on: push: - branches: - - 'main' tags: - 'v*' - pull_request: - branches: [ "develop" ] jobs: docker: From a94feb0828cb835aabddbd498bb705f5b30bf5fd Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sun, 7 Jul 2024 22:06:09 -0400 Subject: [PATCH 10/10] feat: GHCR push support - update workflow requirements to only run docker builds for version releases --- .github/workflows/docker.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d3a44f0de..1bad764d1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,12 +2,13 @@ name: Docker build CI run-name: Docker build CI triggered from @${{ github.actor }} of ${{ github.head_ref }} on: + workflow_dispatch: + merge_group: + pull_request: push: branches: - - 'main' - tags: - - 'v*' - pull_request: + - master + - develop jobs: