Merge branch 'main' of https://git.griefed.de/prosper/gitlab-ci-cd

# Conflicts:
#	Dockerfile

.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
 
 test docker:
   stage: test
-  image: griefed/gitlab-ci-cd:1.0.1
+  image: griefed/gitlab-ci-cd:1.0.4
   services:
     - name: docker:dind
       alias: docker
@@ -21,10 +21,10 @@ test docker:
   script:
     - docker buildx build
       --push
-      --platform linux/amd64,linux/arm/v7,linux/arm64
-      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop"
-      --tag "$CI_REGISTRY_IMAGE:develop"
-      --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop" .
+      --no-cache
+      --platform linux/amd64,linux/arm64
+      --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:
     refs:
       - tags
@@ -34,7 +34,7 @@ test docker:
 release:
   needs: ['test docker']
   stage: release
-  image: griefed/gitlab-ci-cd:1.0.1
+  image: griefed/gitlab-ci-cd:1.0.4
   services:
     - name: docker:dind
       alias: docker
@@ -53,7 +53,7 @@ release:
 
 build:
   stage: build
-  image: griefed/gitlab-ci-cd:1.0.1
+  image: griefed/gitlab-ci-cd:1.0.4
   services:
     - name: docker:dind
       alias: docker
@@ -67,12 +67,10 @@ 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
-      --platform linux/amd64,linux/arm/v7,linux/arm64
-      --cache-from "$CI_REGISTRY_IMAGE:develop"
-      --tag "$CI_REGISTRY_IMAGE:latest"
+      --no-cache
+      --platform linux/amd64,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"

CHANGELOG.md

+### [1.0.4](https://git.griefed.de/prosper/gitlab-ci-cd/compare/1.0.3...1.0.4) (2021-11-16)
+
+
+### 🛠 Fixes
+
+* No pr limit for renovate bot ([a15ffc0](https://git.griefed.de/prosper/gitlab-ci-cd/commit/a15ffc0f7fcd775049ddbc7f50e6ab43efc365ad))
+
+
+### Other
+
+* **deps:** update griefed/gitlab-ci-cd docker tag to v1.0.3 ([f8d8f54](https://git.griefed.de/prosper/gitlab-ci-cd/commit/f8d8f54e39ae8ceb23aae57f97ecd27812354069))
+
+### [1.0.3](https://git.griefed.de/prosper/gitlab-ci-cd/compare/1.0.2...1.0.3) (2021-10-15)
+
+
+### 🦊 CI/CD
+
+* Update ci-cd image to 1.0.2 ([5536a5e](https://git.griefed.de/prosper/gitlab-ci-cd/commit/5536a5eedf38575ae40dd1bd2fac35be730effe0))
+
+
+### 🛠 Fixes
+
+* Update nodejs and npm ([2609aa1](https://git.griefed.de/prosper/gitlab-ci-cd/commit/2609aa1b918c42d2f0f68e3772f0e0e739707558))
+
+### [1.0.2](https://git.griefed.de/prosper/gitlab-ci-cd/compare/1.0.1...1.0.2) (2021-10-15)
+
+
+### 🛠 Fixes
+
+* Use stable-dind as 19.03 did not support armv7 ([3cd7e86](https://git.griefed.de/prosper/gitlab-ci-cd/commit/3cd7e86b5fe4180b1d01d90df60d35b0da85b33d))
+
+
+### Other
+
+* Add GitLab issue templates ([ef94283](https://git.griefed.de/prosper/gitlab-ci-cd/commit/ef94283e4561e57d9e10f05be08340c6244baf23))
+* **deps:** update griefed/gitlab-ci-cd docker tag to v1.0.1 ([990877c](https://git.griefed.de/prosper/gitlab-ci-cd/commit/990877c341f0c6219123f36e5a6dd3fae9dc859b))
+
 ### [1.0.1](https://git.griefed.de/prosper/gitlab-ci-cd/compare/1.0.0...1.0.1) (2021-07-10)
 
 

Dockerfile

@@ -19,13 +19,12 @@ RUN \
     chmod a+x \
       /discord.sh
 
-FROM docker:19.03-dind
+FROM docker:20.10.12-dind-alpine3.15
 
 LABEL maintainer="Griefed <griefed@griefed.de>"
 LABEL description="Provides GitLab Semantic Release, buildx, JDK 8, NodeJS for Griefed's GitLab CI/CD pipelines."
 
 COPY --from=fetcher /docker-buildx /usr/lib/docker/cli-plugins/docker-buildx
-COPY --from=fetcher /discord.sh /discord.sh
 
 ENV DOCKER_CLI_EXPERIMENTAL=enabled
 
@@ -38,10 +37,20 @@ RUN \
     ca-certificates \
     curl \
     git \
+    nodejs-current \
     jq \
-    nodejs \
     npm \
     openjdk8 && \
+  echo "node version is: " && \
+    node -v && \
+  echo "npm version is: " && \
+    npm -v && \
+  echo "updating npm..." && \
+    npm update -g && \
+  echo "node version is: " && \
+    node -v && \
+  echo "npm version is: " && \
+    npm -v && \
   echo "**** Installing GitLab Semantic Release ****" && \
   npm install -g \
     conventional-changelog-conventionalcommits \
@@ -64,4 +73,4 @@ RUN \
   echo "**** Cleanup ****" && \
   rm -rf \
     /var/cache/apk/* \
-    /tmp/*
\ No newline at end of file
+    /tmp/*

renovate.json

@@ -2,7 +2,6 @@
   "extends": [
     "config:base"
   ],
-  "prConcurrentLimit": 5,
   "labels": ["dependencies"],
   "assignees": ["Griefed"]
 }