do not build base

matifali · matifali · commit 29e43e958068 · 2024-01-10T14:49:23.000Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -705,56 +705,6 @@ jobs:
       - name: Install depot.dev CLI
         uses: depot/setup-action@v1
 
-      - name: Create an empty base-build-context directory
-        run: mkdir base-build-context
-
-      - name: Determine base image tag
-        id: image-base-tag
-        run: |
-          set -euo pipefail
-          version="$(./scripts/version.sh)"
-          echo "base_tag=$(CODER_IMAGE_BASE=ghcr.io/coder/coder-base ./scripts/image_tag.sh --version "$version")" >> $GITHUB_OUTPUT
-
-      # This uses OIDC authentication, so no auth variables are required.
-      - name: Build base Docker image via depot.dev
-        uses: depot/build-push-action@v1
-        with:
-          project: d66vz2cd27
-          context: base-build-context
-          file: scripts/Dockerfile.base
-          pull: true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          tags: ${{ steps.image-base-tag.outputs.base_tag }}
-
-      - name: Verify that images are pushed properly
-        run: |
-          # retry 10 times with a 5 second delay as the images may not be
-          # available immediately
-          for i in {1..10}; do
-            rc=0
-            raw_manifests=$(docker buildx imagetools inspect --raw "${{ steps.image-base-tag.outputs.tag }}") || rc=$?
-            if [[ "$rc" -eq 0 ]]; then
-              break
-            fi
-            if [[ "$i" -eq 10 ]]; then
-              echo "Failed to pull manifests after 10 retries"
-              exit 1
-            fi
-            echo "Failed to pull manifests, retrying in 5 seconds"
-            sleep 5
-          done
-
-          manifests=$(
-            echo "$raw_manifests" | \
-              jq -r '.manifests[].platform | .os + "/" + .architecture + (if .variant then "/" + .variant else "" end)'
-          )
-
-          # Verify all 3 platforms are present.
-          set -euxo pipefail
-          echo "$manifests" | grep -q linux/amd64
-          echo "$manifests" | grep -q linux/arm64
-          echo "$manifests" | grep -q linux/arm/v7
-
       - name: Build Linux Docker images
         id: build-docker
         run: |
@@ -764,6 +714,8 @@ jobs:
           version="$(./scripts/version.sh)"
           tag="main-$(echo "$version" | sed 's/+/-/g')"
 
+          export CODER_IMAGE_BUILD_BASE_TAG="ghcr.io/coder/coder-base:latest"
+
           make -j build/coder_"$version"_linux_{amd64,arm64,armv7}.tag
 
           # build and push multi-arch manifest, this depends on the other images
