From 562bccaa5de4ee60c21236c190bcde4ee1b1e107 Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Tue, 16 Nov 2021 21:46:43 +0100
Subject: [PATCH] ci: Move to gitlab-ci-cd:1.0.4 which deprecates armv7 images.
 Staying up-to-date is more important than supporting old platforms. Sorry,
 you may need to consider getting a Raspberry Pi 4.

---
 .gitlab-ci.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f37ec29..8d55b85 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 
 test docker:
   stage: test
-  image: griefed/gitlab-ci-cd:1.0.3
+  image: griefed/gitlab-ci-cd:1.0.4
   services:
     - name: docker:dind
       alias: docker
@@ -22,7 +22,7 @@ test docker:
     - docker buildx build
       --push
       --no-cache
-      --platform linux/amd64,linux/arm/v7,linux/arm64
+      --platform linux/amd64,linux/arm64
       --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop"
       --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop" .
   except:
@@ -34,7 +34,7 @@ test docker:
 release:
   needs: ['test docker']
   stage: release
-  image: griefed/gitlab-ci-cd:1.0.3
+  image: griefed/gitlab-ci-cd:1.0.4
   services:
     - name: docker:dind
       alias: docker
@@ -54,7 +54,7 @@ release:
 
 build:
   stage: build
-  image: griefed/gitlab-ci-cd:1.0.3
+  image: griefed/gitlab-ci-cd:1.0.4
   services:
     - name: docker:dind
       alias: docker
@@ -68,14 +68,13 @@ build:
     - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
     - docker buildx create --use --name grfdbuilder
   script:
-    - docker pull "$CI_REGISTRY_IMAGE:develop"
     - docker buildx build
       --push
       --no-cache
-      --platform linux/amd64,linux/arm/v7,linux/arm64
+      --platform linux/amd644,linux/arm64
       --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG"
       --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest"
       --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG"
       --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest" .
   only:
-    - tags
\ No newline at end of file
+    - tags
-- 
GitLab