.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
@@ -23,8 +23,8 @@ test docker:
       --push
       --no-cache
       --platform linux/amd64,linux/arm64
-      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop"
-      --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop" .
+      --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

CHANGELOG.md

+## [1.1.0](https://git.griefed.de/prosper/gitlab-ci-cd/compare/1.0.4...1.1.0) (2022-01-21)
+
+
+### 🦊 CI/CD
+
+* Update to 20.10.12-dind-alpine3.15 ([504c6cc](https://git.griefed.de/prosper/gitlab-ci-cd/commit/504c6cc1ed2b5e4f20936bc11be5580659c02870))
+* 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. ([b5572fc](https://git.griefed.de/prosper/gitlab-ci-cd/commit/b5572fcb3a92cce3b9de6deacb041d97308c078e))
+
+
+### 🚀 Features
+
+* Add discord.sh for webhook messages ([b0968e2](https://git.griefed.de/prosper/gitlab-ci-cd/commit/b0968e268bc9b763ad09eae6c39e6343b78521ed))
+
+
+### 🛠 Fixes
+
+* Add copy from fetcher that got lost during merge ([2f8e148](https://git.griefed.de/prosper/gitlab-ci-cd/commit/2f8e14872fd9ede45c1053bd5d1f924ff083a73e))
+
+
+### Other
+
+* **deps:** update docker docker tag to v20.10.11 ([bb3913a](https://git.griefed.de/prosper/gitlab-ci-cd/commit/bb3913aa7d250c8c514b0cc8995051a56c439071))
+* **deps:** update docker docker tag to v20.10.12 ([c11124c](https://git.griefed.de/prosper/gitlab-ci-cd/commit/c11124c2ef85c7ad1a62c129ad8cd4126a33583c))
+
 ### [1.0.4](https://git.griefed.de/prosper/gitlab-ci-cd/compare/1.0.3...1.0.4) (2021-11-16)
 
 

Dockerfile

@@ -4,19 +4,28 @@ RUN \
   apk add \
     curl && \
   LATEST_DOCKERX=$(curl --silent "https://api.github.com/repos/docker/buildx/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/' | cut -c 2-) && \
-  curl \
-    -L \
-    --output /docker-buildx \
-      "https://github.com/docker/buildx/releases/download/v${LATEST_DOCKERX}/buildx-v${LATEST_DOCKERX}.linux-amd64" && \
-  chmod a+x \
-    /docker-buildx
+  echo "**** Acquire docker-buildx" && \
+    curl \
+      -L \
+      --output /docker-buildx \
+        "https://github.com/docker/buildx/releases/download/v${LATEST_DOCKERX}/buildx-v${LATEST_DOCKERX}.linux-amd64" && \
+    chmod a+x \
+      /docker-buildx && \
+  echo "**** Acquire discord.sh from ChaoticWeg/discord.sh" && \
+    curl \
+      -L \
+      --output /discord.sh \
+        https://raw.githubusercontent.com/ChaoticWeg/discord.sh/master/discord.sh && \
+    chmod a+x \
+      /discord.sh
 
-FROM docker:20.10.10-dind-alpine3.14
+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
 
@@ -30,14 +39,15 @@ RUN \
     curl \
     git \
     nodejs-current \
+    jq \
     npm \
     openjdk8 && \
-    echo "node version is: " && \
+  echo "node version is: " && \
     node -v && \
   echo "npm version is: " && \
     npm -v && \
   echo "updating npm..." && \
-  npm update -g && \
+    npm update -g && \
   echo "node version is: " && \
     node -v && \
   echo "npm version is: " && \
@@ -53,13 +63,16 @@ RUN \
     @semantic-release/gitlab \
     @semantic-release/npm \
     @semantic-release/release-notes-generator && \
-  echo "**** Making docker-buildx executable for all ****" && \
+  echo "**** Making docker-buildx and discord.sh executable for all ****" && \
   chmod a+x \
     /usr/lib/docker/cli-plugins/docker-buildx && \
+  chmod a+x \
+    /discord.sh && \
   echo "**** Installing quasar ****" && \
   npm install -g \
     @quasar/cli && \
   echo "**** Cleanup ****" && \
   rm -rf \
     /var/cache/apk/* \
-    /tmp/*
+    /tmp/* \
+

README.md

@@ -15,3 +15,4 @@ Combines:
 - [GitLab Semantic Release](https://git.griefed.de/prosper/gitlab-semantic-release)
 - NodeJS for CI
 - Docker-in-Docker
+- [discord.sh](https://github.com/ChaoticWeg/discord.sh)
\ No newline at end of file

renovate.json

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