From a9b1faea07931862469087fd94bef6700c212327 Mon Sep 17 00:00:00 2001
From: Ethan Reesor <ethan.reesor@gmail.com>
Date: Sat, 23 Sep 2023 15:57:32 -0500
Subject: [PATCH] CI

---
 .gitlab/release.gitlab-ci.yml | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/.gitlab/release.gitlab-ci.yml b/.gitlab/release.gitlab-ci.yml
index 9b260bbdb..759869730 100644
--- a/.gitlab/release.gitlab-ci.yml
+++ b/.gitlab/release.gitlab-ci.yml
@@ -13,44 +13,22 @@ git describe:
     reports:
       dotenv: git.env
 
-docker buildx:
-  stage: test
-  extends: .rules release
-  image: docker:20-git
-  needs: []
-  variables:
-    GIT_STRATEGY: none
-  artifacts:
-    paths:
-      - buildx
-    expire_in: 1 day
-  services: [ docker:20-dind ]
-  script:
-    - export DOCKER_BUILDKIT=1
-    - git clone https://github.com/docker/buildx ./docker-buildx
-    - docker build --platform=local -o . ./docker-buildx
-
 build main image:
   stage: test
   extends: .rules release
   needs: [ docker buildx ]
-  image: docker:20
+  image: docker:24
   timeout: 2 hours
   services:
-    - name: docker:20-dind
-      command: [ --experimental ] # Do we need this?
+    - name: docker:24-dind
   variables:
     COSIGN_YES: "true"
   id_tokens:
     SIGSTORE_ID_TOKEN:
       aud: sigstore
   before_script:
-    - mkdir -p ~/.docker/cli-plugins
-    - mv buildx ~/.docker/cli-plugins/docker-buildx
-    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-    - apk add --update cosign
+    - apk add --update cosign make
   script:
-    - docker buildx create --use
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - make docker-push IMAGE=$PRODUCTION_IMAGE
     - IMAGE_DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' $PRODUCTION_IMAGE)