From b7cad9a6b6fbcc54a4632f09479e6469bc03fe6d Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Sun, 23 Jan 2022 14:42:19 +0100
Subject: [PATCH] breaking: Use inofficial mazzolino/docker:20.10.12-dind to
allow for armv7 builds again
---
.gitlab-ci.yml | 4 ++--
Dockerfile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 335ec15..48c2095 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ test docker:
- docker buildx build
--push
--no-cache
- --platform linux/amd64,linux/arm64
+ --platform linux/amd64,linux/arm64,linux/arm/v7
--tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop-$CI_COMMIT_SHORT_SHA"
--tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop-$CI_COMMIT_SHORT_SHA" .
except:
@@ -70,7 +70,7 @@ build:
- docker buildx build
--push
--no-cache
- --platform linux/amd64,linux/arm64
+ --platform linux/amd64,linux/arm64,linux/arm/v7
--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"
diff --git a/Dockerfile b/Dockerfile
index 866a6a9..519e849 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN \
chmod a+x \
/discord.sh
-FROM docker:20.10.12-dind-alpine3.15
+FROM mazzolino/docker:20.10.12-dind
LABEL maintainer="Griefed <griefed@griefed.de>"
LABEL description="Provides GitLab Semantic Release, buildx, JDK 8, NodeJS for Griefed's GitLab CI/CD pipelines."
--
GitLab