chore(ci): use upstream container image registry

Reviewed-on: #25

.drone.yml

@@ -11,12 +11,12 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.38.0
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.44.0
   resources:
     limits:
       cpu: 150
@@ -66,10 +66,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
 - name: build
-  image: docker.io/plugins/docker:20.17.2
+  image: docker.io/plugins/docker:20.18.6
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -132,10 +132,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
 - name: build
-  image: docker.io/plugins/docker:20.17.2
+  image: docker.io/plugins/docker:20.18.6
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -198,10 +198,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
 - name: build
-  image: docker.io/plugins/docker:20.17.2
+  image: docker.io/plugins/docker:20.18.6
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -262,10 +262,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
 - name: build
-  image: docker.io/plugins/docker:20.17.2
+  image: docker.io/plugins/docker:20.18.6
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -328,7 +328,7 @@ node_selector:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
 - name: build-manifest
   image: docker.io/plugins/manifest:1.4.0
@@ -385,7 +385,7 @@ depends_on:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
 - name: latest-sync
   commands:
@@ -399,7 +399,7 @@ steps:
       from_secret: container_image_registry_user
     DEST_CRED_PASSWORD:
       from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.14.0
+  image: quay.io/skopeo/stable:v1.18.0
 
 - name: email-notification
   environment:
@@ -446,10 +446,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
 - name: build
-  image: docker.io/plugins/docker:20.17.2
+  image: docker.io/plugins/docker:20.18.6
   settings:
     auto_tag: true
     auto_tag_suffix: amd64
@@ -506,10 +506,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
 - name: build
-  image: docker.io/plugins/docker:20.17.2
+  image: docker.io/plugins/docker:20.18.6
   settings:
     auto_tag: true
     auto_tag_suffix: arm64-v8
@@ -571,7 +571,7 @@ node_selector:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
 - name: build-manifest
   image: docker.io/plugins/manifest:1.4.0
@@ -625,7 +625,7 @@ depends_on:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
 - name: tagged-sync
   commands:
@@ -639,7 +639,7 @@ steps:
       from_secret: container_image_registry_user
     DEST_CRED_PASSWORD:
       from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.14.0
+  image: quay.io/skopeo/stable:v1.18.0
 
 - name: email-notification
   environment:

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/golang:1.23.0-alpine3.20 AS build
+FROM docker.io/library/golang:1.24.2-alpine3.21 AS build
 
 ARG DC_VERSION=main
 
@@ -11,7 +11,7 @@ RUN git clone https://github.com/docker/compose.git --branch ${DC_VERSION} docke
     cd docker-compose && \
     make DESTDIR=/cache
 
-FROM docker.io/library/alpine:3.20
+FROM docker.io/library/alpine:3.21
 
 COPY --from=build /cache/docker-compose /usr/bin/docker-compose
 

Makefile

@@ -1,6 +1,6 @@
 # DC_VERSION
 # Only required to install a specifiy version
-DC_VERSION?=v2.29.2 # renovate: datasource=github-releases depName=docker/compose
+DC_VERSION?=v2.34.0 # renovate: datasource=github-releases depName=docker/compose
 
 # CONTAINER_RUNTIME
 # The CONTAINER_RUNTIME variable will be used to specified the path to a container runtime. This is needed to start and
@@ -9,14 +9,13 @@ CONTAINER_RUNTIME?=$(shell which podman)
 
 # DC_IMAGE_REGISTRY_NAME
 # Defines the name of the new container to be built using several variables.
-DC_IMAGE_REGISTRY_NAME:=git.cryptic.systems
+DC_IMAGE_REGISTRY_NAME?=git.cryptic.systems
-DC_IMAGE_REGISTRY_USER:=volker.raschek
+DC_IMAGE_REGISTRY_USER?=volker.raschek
 
 DC_IMAGE_NAMESPACE?=${DC_IMAGE_REGISTRY_USER}
 DC_IMAGE_NAME:=docker-compose
 DC_IMAGE_VERSION?=latest
 DC_IMAGE_FULLY_QUALIFIED=${DC_IMAGE_REGISTRY_NAME}/${DC_IMAGE_NAMESPACE}/${DC_IMAGE_NAME}:${DC_IMAGE_VERSION}
-DC_IMAGE_UNQUALIFIED=${DC_IMAGE_NAMESPACE}/${DC_IMAGE_NAME}:${DC_IMAGE_VERSION}
 
 # BUILD CONTAINER IMAGE
 # =====================================================================================================================
@@ -28,14 +27,13 @@ container-image/build:
 		--no-cache \
 		--pull \
 		--tag ${DC_IMAGE_FULLY_QUALIFIED} \
-		--tag ${DC_IMAGE_UNQUALIFIED} \
 		.
 
 # DELETE CONTAINER IMAGE
 # =====================================================================================================================
 PHONY:=container-image/delete
 container-image/delete:
-	- ${CONTAINER_RUNTIME} image rm ${DC_IMAGE_FULLY_QUALIFIED} ${DC_IMAGE_UNQUALIFIED}
+	- ${CONTAINER_RUNTIME} image rm ${DC_IMAGE_FULLY_QUALIFIED}
 	- ${CONTAINER_RUNTIME} image rm ${BASE_IMAGE_FULL}
 
 # PUSH CONTAINER IMAGE

renovate.json

@@ -1,40 +1,16 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "assignees": [ "volker.raschek" ],
+  "extends": [
-  "labels": [ "renovate" ],
+    "local>volker.raschek/renovate-config:default#master",
+    "local>volker.raschek/renovate-config:container#master",
+    "local>volker.raschek/renovate-config:actions#master",
+    "local>volker.raschek/renovate-config:regexp#master"
+  ],
   "packageRules": [
     {
-      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
-      "automerge": true,
-      "matchManagers": "droneci",
-      "matchUpdateTypes": [ "minor", "patch"]
-    },
-    {
-      "description": "Automatically update patch version of used container images in docker files",
-      "addLabels": [ "renovate/container-image", "renovate/automerge" ],
-      "automerge": true,
-      "matchBaseBranches": [ "master" ],
-      "matchManagers": [ "dockerfile" ],
-      "matchUpdateTypes": [ "patch" ]
-    },
-    {
-      "addLabels": [ "renovate/docker-compose", "renovate/automerge" ],
       "automerge": false,
       "matchPackageNames": [ "docker-compose" ],
       "matchManagers": [ "regex" ]
     }
-  ],
-  "rebaseLabel": "renovate/rebase",
-  "rebaseWhen": "behind-base-branch",
-  "regexManagers": [
-    {
-      "description": "Update version",
-      "fileMatch": [
-        "^Makefile$"
-      ],
-      "matchStrings": [
-        "DC_VERSION\\?=(?<currentValue>.*) # renovate: datasource=(?<datasource>.*) depName=(?<depName>.*)( lookupName=(?<lookupName>.*))?( versioning=(?<versioning>.*))?"
-      ]
-    }
   ]
 }