From 94d36ea9df8f62dae27a78c814cfb56614f4d1f2 Mon Sep 17 00:00:00 2001 From: Filipe C Menezes Date: Thu, 3 Oct 2024 13:43:58 +0100 Subject: [PATCH 1/6] CLOUDP-275620 Fix broken docker build test github action --- .github/workflows/code-health.yml | 15 +++++++++++++++ .github/workflows/docker-build-test.yml | 23 ----------------------- 2 files changed, 15 insertions(+), 23 deletions(-) delete mode 100644 .github/workflows/docker-build-test.yml diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml index 430bf015d3..5ad4036d87 100644 --- a/.github/workflows/code-health.yml +++ b/.github/workflows/code-health.yml @@ -222,3 +222,18 @@ jobs: with: go-version-file: 'go.mod' - run: make check-templates + verify_image: + name: Build docker image + runs-on: ubuntu-latest + steps: + - uses: GitHubSecurityLab/actions-permissions/monitor@v1 + with: + config: ${{ vars.PERMISSIONS_CONFIG }} + - name: Check out the repo + uses: actions/checkout@v4 + - name: Linting + uses: hadolint/hadolint-action@v3.1.0 + with: + dockerfile: Dockerfile + - name: Build Image + run: docker buildx build --no-cache -t atlas . diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml deleted file mode 100644 index 01e91d3ad1..0000000000 --- a/.github/workflows/docker-build-test.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Build CLI Docker image - -on: - push: - paths: - - 'Dockerfile' - -jobs: - verify_image: - name: Build docker image - runs-on: ubuntu-latest - steps: - - uses: GitHubSecurityLab/actions-permissions/monitor@v1 - with: - config: ${{ vars.PERMISSIONS_CONFIG }} - - name: Check out the repo - uses: actions/checkout@v4 - - name: Linting - uses: hadolint/hadolint-action@v3.1.0 - with: - dockerfile: Dockerfile - - name: Build Image - run: docker buildx build --no-cache -t atlas . From 1a3d763234c14e31aa9cbc8aa3c44e76d266609a Mon Sep 17 00:00:00 2001 From: Filipe C Menezes Date: Thu, 3 Oct 2024 13:48:25 +0100 Subject: [PATCH 2/6] prepare buildx --- .github/workflows/code-health.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml index 5ad4036d87..95b39d6f9d 100644 --- a/.github/workflows/code-health.yml +++ b/.github/workflows/code-health.yml @@ -235,5 +235,7 @@ jobs: uses: hadolint/hadolint-action@v3.1.0 with: dockerfile: Dockerfile + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3.7.0 - name: Build Image run: docker buildx build --no-cache -t atlas . From 85dc57286d6d80e565d19314b117a53add9e2df1 Mon Sep 17 00:00:00 2001 From: Filipe C Menezes Date: Thu, 3 Oct 2024 14:00:45 +0100 Subject: [PATCH 3/6] test --- .github/workflows/code-health.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml index 95b39d6f9d..e130805930 100644 --- a/.github/workflows/code-health.yml +++ b/.github/workflows/code-health.yml @@ -237,5 +237,10 @@ jobs: dockerfile: Dockerfile - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3.7.0 - - name: Build Image - run: docker buildx build --no-cache -t atlas . + - name: Build and push image to dockerhub staging registry + uses: docker/build-push-action@v6.9.0 + with: + context: . + platforms: linux/amd64,linux/arm64 + tags: mongodb/atlas:test + file: Dockerfile From 1c2f1a748323d4103d5e32d062b0cfc0dfe8dac9 Mon Sep 17 00:00:00 2001 From: Filipe C Menezes Date: Thu, 3 Oct 2024 14:04:37 +0100 Subject: [PATCH 4/6] logout --- .github/workflows/code-health.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml index e130805930..460272adec 100644 --- a/.github/workflows/code-health.yml +++ b/.github/workflows/code-health.yml @@ -237,7 +237,8 @@ jobs: dockerfile: Dockerfile - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3.7.0 - - name: Build and push image to dockerhub staging registry + - run: docker logout + - name: Build image to dockerhub staging registry uses: docker/build-push-action@v6.9.0 with: context: . From 50bb4739bf1c4c066fccf9fc83bb265f4fe8c2c8 Mon Sep 17 00:00:00 2001 From: Filipe C Menezes Date: Thu, 3 Oct 2024 14:09:07 +0100 Subject: [PATCH 5/6] add env --- .github/workflows/code-health.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml index 460272adec..289068a4c9 100644 --- a/.github/workflows/code-health.yml +++ b/.github/workflows/code-health.yml @@ -225,6 +225,8 @@ jobs: verify_image: name: Build docker image runs-on: ubuntu-latest + env: + DOCKER_CLI_EXPERIMENTAL: enabled steps: - uses: GitHubSecurityLab/actions-permissions/monitor@v1 with: From 075d250d27f7cbf3b09f44d2c460c56ac5915d6c Mon Sep 17 00:00:00 2001 From: Filipe C Menezes Date: Thu, 3 Oct 2024 14:17:24 +0100 Subject: [PATCH 6/6] enable containerd --- .github/workflows/code-health.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml index 289068a4c9..4d8b68a90f 100644 --- a/.github/workflows/code-health.yml +++ b/.github/workflows/code-health.yml @@ -237,9 +237,18 @@ jobs: uses: hadolint/hadolint-action@v3.1.0 with: dockerfile: Dockerfile + - name: Enable containerd image store + uses: crazy-max/ghaction-setup-docker@v3.3.0 + with: + version: v24.0.6 + daemon-config: | + { + "features": { + "containerd-snapshotter": true + } + } - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3.7.0 - - run: docker logout - name: Build image to dockerhub staging registry uses: docker/build-push-action@v6.9.0 with: