.drone.yml

@@ -3,20 +3,14 @@ kind: pipeline
 type: kubernetes
 name: linter
 
-clone:
-  disable: true
-
 platform:
   os: linux
 
 steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.43.0
+  image: docker.io/volkerraschek/markdownlint:0.33.0
   resources:
     limits:
       cpu: 150
@@ -34,7 +28,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
   resources:
     limits:
       cpu: 150
@@ -54,38 +48,24 @@ kind: pipeline
 type: docker
 name: dry-run-amd64
 
-clone:
-  disable: true
-
-depends_on:
-- linter
-
 platform:
   os: linux
   arch: amd64
 
 steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
 - name: build
-  image: docker.io/plugins/docker:20.18.6
+  image: docker.io/plugins/docker:latest
   settings:
-    auto_tag: false
     dockerfile: Dockerfile
+    auto_tag: false
     dry_run: true
-    force_tag: true
-    no_cache: true
-    purge: true
-    mirror:
-      from_secret: docker_io_mirror
-    registry: git.cryptic.systems
-    repo: git.cryptic.systems/volker.raschek/postfixadmin-fetchmail
     tags: latest-amd64
+    repo: volkerraschek/postfixadmin-fetchmail
     username:
-      from_secret: git_cryptic_systems_container_registry_user
+      from_secret: container_image_registry_user
     password:
-      from_secret: git_cryptic_systems_container_registry_password
+      from_secret: container_image_registry_password
+    no_cache: true
 
 - name: email-notification
   environment:
@@ -99,12 +79,70 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
   when:
     status:
     - changed
     - failure
 
+depends_on:
+- linter
+
+trigger:
+  branch:
+    exclude:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
+
+---
+kind: pipeline
+type: docker
+name: dry-run-arm-v7
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: false
+    dry_run: true
+    tags: latest-arm-v7
+    repo: volkerraschek/postfixadmin-fetchmail
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+    no_cache: true
+
+- name: email-notification
+  environment:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
+      from_secret: smtp_host
+    SMTP_USERNAME:
+      from_secret: smtp_username
+    SMTP_PASSWORD:
+      from_secret: smtp_password
+  image: docker.io/volkerraschek/drone-email:0.1.1
+  when:
+    status:
+    - changed
+    - failure
+
+depends_on:
+- linter
+
 trigger:
   branch:
     exclude:
@@ -120,38 +158,24 @@ kind: pipeline
 type: docker
 name: dry-run-arm64-v8
 
-clone:
-  disable: true
-
-depends_on:
-- linter
-
 platform:
   os: linux
   arch: arm64
 
 steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
 - name: build
-  image: docker.io/plugins/docker:20.18.6
+  image: docker.io/plugins/docker:latest
   settings:
-    auto_tag: false
     dockerfile: Dockerfile
+    auto_tag: false
     dry_run: true
-    force_tag: true
-    no_cache: true
-    purge: true
-    mirror:
-      from_secret: docker_io_mirror
-    registry: git.cryptic.systems
-    repo: git.cryptic.systems/volker.raschek/postfixadmin-fetchmail
     tags: latest-arm64-v8
+    repo: volkerraschek/postfixadmin-fetchmail
     username:
-      from_secret: git_cryptic_systems_container_registry_user
+      from_secret: container_image_registry_user
     password:
-      from_secret: git_cryptic_systems_container_registry_password
+      from_secret: container_image_registry_password
+    no_cache: true
 
 - name: email-notification
   environment:
@@ -165,12 +189,15 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
   when:
     status:
     - changed
     - failure
 
+depends_on:
+- linter
+
 trigger:
   branch:
     exclude:
@@ -186,37 +213,23 @@ kind: pipeline
 type: docker
 name: latest-amd64
 
-clone:
-  disable: true
-
-depends_on:
-- linter
-
 platform:
   os: linux
   arch: amd64
 
 steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
 - name: build
-  image: docker.io/plugins/docker:20.18.6
+  image: docker.io/plugins/docker:latest
   settings:
-    auto_tag: false
     dockerfile: Dockerfile
-    force_tag: true
+    auto_tag: false
-    no_cache: true
-    purge: true
-    mirror:
-      from_secret: docker_io_mirror
-    registry: git.cryptic.systems
-    repo: git.cryptic.systems/volker.raschek/postfixadmin-fetchmail
     tags: latest-amd64
+    repo: volkerraschek/postfixadmin-fetchmail
     username:
-      from_secret: git_cryptic_systems_container_registry_user
+      from_secret: container_image_registry_user
     password:
-      from_secret: git_cryptic_systems_container_registry_password
+      from_secret: container_image_registry_password
+    no_cache: true
 
 - name: email-notification
   environment:
@@ -230,12 +243,68 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
   when:
     status:
     - changed
     - failure
 
+depends_on:
+- linter
+
+trigger:
+  branch:
+  - master
+  event:
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
+
+---
+kind: pipeline
+type: docker
+name: latest-arm-v7
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: false
+    tags: latest-arm-v7
+    repo: volkerraschek/postfixadmin-fetchmail
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+    no_cache: true
+
+- name: email-notification
+  environment:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
+      from_secret: smtp_host
+    SMTP_USERNAME:
+      from_secret: smtp_username
+    SMTP_PASSWORD:
+      from_secret: smtp_password
+  image: docker.io/volkerraschek/drone-email:0.1.1
+  when:
+    status:
+    - changed
+    - failure
+
+depends_on:
+- linter
+
 trigger:
   branch:
   - master
@@ -250,37 +319,23 @@ kind: pipeline
 type: docker
 name: latest-arm64-v8
 
-clone:
-  disable: true
-
-depends_on:
-- linter
-
 platform:
   os: linux
   arch: arm64
 
 steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
 - name: build
-  image: docker.io/plugins/docker:20.18.6
+  image: docker.io/plugins/docker:latest
   settings:
-    auto_tag: false
     dockerfile: Dockerfile
-    force_tag: true
+    auto_tag: false
-    no_cache: true
-    purge: true
-    mirror:
-      from_secret: docker_io_mirror
-    registry: git.cryptic.systems
-    repo: git.cryptic.systems/volker.raschek/postfixadmin-fetchmail
     tags: latest-arm64-v8
+    repo: volkerraschek/postfixadmin-fetchmail
     username:
-      from_secret: git_cryptic_systems_container_registry_user
+      from_secret: container_image_registry_user
     password:
-      from_secret: git_cryptic_systems_container_registry_password
+      from_secret: container_image_registry_password
+    no_cache: true
 
 - name: email-notification
   environment:
@@ -294,12 +349,15 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
   when:
     status:
     - changed
     - failure
 
+depends_on:
+- linter
+
 trigger:
   branch:
   - master
@@ -314,32 +372,17 @@ kind: pipeline
 type: kubernetes
 name: latest-manifest
 
-clone:
-  disable: true
-
-depends_on:
-- latest-amd64
-- latest-arm64-v8
-
-# docker.io/plugins/manifest only for amd64 architectures available
-node_selector:
-  kubernetes.io/os: linux
-  kubernetes.io/arch: amd64
-
 steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
 - name: build-manifest
-  image: docker.io/plugins/manifest:1.4.0
+  image: docker.io/plugins/manifest:latest
   settings:
     auto_tag: false
     ignore_missing: true
     spec: manifest.tmpl
     username:
-      from_secret: git_cryptic_systems_container_registry_user
+      from_secret: container_image_registry_user
     password:
-      from_secret: git_cryptic_systems_container_registry_password
+      from_secret: container_image_registry_password
 
 - name: email-notification
   environment:
@@ -353,7 +396,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
   resources:
     limits:
       cpu: 150
@@ -363,65 +406,10 @@ steps:
     - changed
     - failure
 
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/postfixadmin-fetchmail-docker
-
----
-kind: pipeline
-type: kubernetes
-name: latest-sync
-
-clone:
-  disable: true
-
 depends_on:
-- latest-manifest
+- latest-amd64
-
+- latest-arm-v7
-steps:
+- latest-arm64-v8
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
-- name: latest-sync
-  commands:
-  - skopeo sync --all --src=docker --src-creds=$SRC_CRED_USERNAME:$SRC_CRED_PASSWORD --dest=docker --dest-creds=$DEST_CRED_USERNAME:$DEST_CRED_PASSWORD git.cryptic.systems/volker.raschek/postfixadmin-fetchmail docker.io/volkerraschek
-  environment:
-    SRC_CRED_USERNAME:
-      from_secret: git_cryptic_systems_container_registry_user
-    SRC_CRED_PASSWORD:
-      from_secret: git_cryptic_systems_container_registry_password
-    DEST_CRED_USERNAME:
-      from_secret: container_image_registry_user
-    DEST_CRED_PASSWORD:
-      from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.18.0
-
-- name: email-notification
-  environment:
-    SMTP_FROM_ADDRESS:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
-      from_secret: smtp_host
-    SMTP_USERNAME:
-      from_secret: smtp_username
-    SMTP_PASSWORD:
-      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
-  when:
-    status:
-    - changed
-    - failure
 
 trigger:
   branch:
@@ -437,34 +425,23 @@ kind: pipeline
 type: docker
 name: tagged-amd64
 
-clone:
-  disable: true
-
 platform:
   os: linux
   arch: amd64
 
 steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
 - name: build
-  image: docker.io/plugins/docker:20.18.6
+  image: docker.io/plugins/docker:latest
   settings:
+    dockerfile: Dockerfile
     auto_tag: true
     auto_tag_suffix: amd64
-    dockerfile: Dockerfile
+    repo: volkerraschek/postfixadmin-fetchmail
-    force_tag: true
-    no_cache: true
-    purge: true
-    mirror:
-      from_secret: docker_io_mirror
-    registry: git.cryptic.systems
-    repo: git.cryptic.systems/volker.raschek/postfixadmin-fetchmail
     username:
-      from_secret: git_cryptic_systems_container_registry_user
+      from_secret: container_image_registry_user
     password:
-      from_secret: git_cryptic_systems_container_registry_password
+      from_secret: container_image_registry_password
+    no_cache: true
 
 - name: email-notification
   environment:
@@ -478,7 +455,54 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
+  when:
+    status:
+    - changed
+    - failure
+
+trigger:
+  event:
+  - tag
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
+
+---
+kind: pipeline
+type: docker
+name: tagged-arm-v7
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: true
+    auto_tag_suffix: arm-v7
+    repo: volkerraschek/postfixadmin-fetchmail
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+    no_cache: true
+
+- name: email-notification
+  environment:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
+      from_secret: smtp_host
+    SMTP_USERNAME:
+      from_secret: smtp_username
+    SMTP_PASSWORD:
+      from_secret: smtp_password
+  image: docker.io/volkerraschek/drone-email:0.1.1
   when:
     status:
     - changed
@@ -495,34 +519,23 @@ kind: pipeline
 type: docker
 name: tagged-arm64-v8
 
-clone:
-  disable: true
-
 platform:
   os: linux
   arch: arm64
 
 steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
 - name: build
-  image: docker.io/plugins/docker:20.18.6
+  image: docker.io/plugins/docker:latest
   settings:
+    dockerfile: Dockerfile
     auto_tag: true
     auto_tag_suffix: arm64-v8
-    dockerfile: Dockerfile
+    repo: volkerraschek/postfixadmin-fetchmail
-    force_tag: true
-    no_cache: true
-    purge: true
-    mirror:
-      from_secret: docker_io_mirror
-    registry: git.cryptic.systems
-    repo: git.cryptic.systems/volker.raschek/postfixadmin-fetchmail
     username:
-      from_secret: git_cryptic_systems_container_registry_user
+      from_secret: container_image_registry_user
     password:
-      from_secret: git_cryptic_systems_container_registry_password
+      from_secret: container_image_registry_password
+    no_cache: true
 
 - name: email-notification
   environment:
@@ -536,7 +549,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
   when:
     status:
     - changed
@@ -553,32 +566,17 @@ kind: pipeline
 type: kubernetes
 name: tagged-manifest
 
-clone:
-  disable: true
-
-depends_on:
-- tagged-amd64
-- tagged-arm64-v8
-
-# docker.io/plugins/manifest only for amd64 architectures available
-node_selector:
-  kubernetes.io/os: linux
-  kubernetes.io/arch: amd64
-
 steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
 - name: build-manifest
-  image: docker.io/plugins/manifest:1.4.0
+  image: docker.io/plugins/manifest:latest
   settings:
     auto_tag: true
     ignore_missing: true
     spec: manifest.tmpl
     username:
-      from_secret: git_cryptic_systems_container_registry_user
+      from_secret: container_image_registry_user
     password:
-      from_secret: git_cryptic_systems_container_registry_password
+      from_secret: container_image_registry_password
 
 - name: email-notification
   environment:
@@ -592,7 +590,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
   resources:
     limits:
       cpu: 150
@@ -602,62 +600,10 @@ steps:
     - changed
     - failure
 
-trigger:
-  event:
-  - tag
-  repo:
-  - volker.raschek/postfixadmin-fetchmail-docker
-
----
-kind: pipeline
-type: kubernetes
-name: tagged-sync
-
-clone:
-  disable: true
-
 depends_on:
-- tagged-manifest
+- tagged-amd64
-
+- tagged-arm-v7
-steps:
+- tagged-arm64-v8
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
-- name: tagged-sync
-  commands:
-  - skopeo sync --all --src=docker --src-creds=$SRC_CRED_USERNAME:$SRC_CRED_PASSWORD --dest=docker --dest-creds=$DEST_CRED_USERNAME:$DEST_CRED_PASSWORD git.cryptic.systems/volker.raschek/postfixadmin-fetchmail docker.io/volkerraschek
-  environment:
-    SRC_CRED_USERNAME:
-      from_secret: git_cryptic_systems_container_registry_user
-    SRC_CRED_PASSWORD:
-      from_secret: git_cryptic_systems_container_registry_password
-    DEST_CRED_USERNAME:
-      from_secret: container_image_registry_user
-    DEST_CRED_PASSWORD:
-      from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.18.0
-
-- name: email-notification
-  environment:
-    SMTP_FROM_ADDRESS:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
-      from_secret: smtp_host
-    SMTP_USERNAME:
-      from_secret: smtp_username
-    SMTP_PASSWORD:
-      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
-  when:
-    status:
-    - changed
-    - failure
 
 trigger:
   event:

Dockerfile

@@ -1,28 +1,13 @@
-FROM docker.io/library/alpine:3.21.3
+FROM docker.io/library/alpine:3.17.1
-
-# The file /etc/apk/repositories contains a list of the apk repositories. By
-# default contains this file a list of the stable repositories pointing to the
-# alpine version.
-#
-# Some perl packages are not part of the stable repositories. For this reason
-# are the repositories switched to edge to access directly the latest versions
-# of this apk packages.
-#
-# Using stable and edge at the same time is not allowed. For more information,
-# take a look into the documentation of the edge repository.
-#
-#   https://wiki.alpinelinux.org/wiki/Repositories#Edge
-RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/main" > /etc/apk/repositories
-RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
-
-# Install packages
-RUN apk upgrade && \
-    apk add --update perl perl-lockfile-simple perl-dbi perl-dbd-pg perl-dbd-mysql fetchmail
 
+RUN echo "http://dl-3.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories
+RUN apk upgrade
+RUN apk add --update perl perl-lockfile-simple perl-dbi perl-dbd-pg perl-dbd-mysql fetchmail
 RUN mkdir --parents /run/fetchmail
 
 COPY --chown=fetchmail:fetchmail fetchmail.pl /usr/local/bin/fetchmail.pl
 
 USER fetchmail
 
+ENTRYPOINT [ "/usr/bin/perl" ]
 CMD [ "/usr/local/bin/fetchmail.pl" ]

Makefile

@@ -1,42 +1,44 @@
-# PODMAN_BIN's and tools
+# CONTAINER_RUNTIME
-PODMAN_BIN?=$(shell which podman)
+# The CONTAINER_RUNTIME variable will be used to specified the path to a
+# container runtime. This is needed to start and run a container image.
+CONTAINER_RUNTIME?=$(shell which podman)
 
-# FETCHMAIL_IMAGE
+# FETCHMAIL_IMAGE_REGISTRY_NAME
-FETCHMAIL_IMAGE_REGISTRY_HOST?=git.cryptic.systems
+# Defines the name of the new container to be built using several variables.
-FETCHMAIL_IMAGE_REPOSITORY?=volker.raschek/postfixadmin-fetchmail
+FETCHMAIL_IMAGE_REGISTRY_NAME:=docker.io
+FETCHMAIL_IMAGE_REGISTRY_USER:=volkerraschek
+
+FETCHMAIL_IMAGE_NAMESPACE?=${FETCHMAIL_IMAGE_REGISTRY_USER}
+FETCHMAIL_IMAGE_NAME:=postfixadmin-fetchmail
 FETCHMAIL_IMAGE_VERSION?=latest
-FETCHMAIL_IMAGE_FULLY_QUALIFIED=${FETCHMAIL_IMAGE_REGISTRY_HOST}/${FETCHMAIL_IMAGE_REPOSITORY}:${FETCHMAIL_IMAGE_VERSION}
+FETCHMAIL_IMAGE_FULLY_QUALIFIED=${FETCHMAIL_IMAGE_REGISTRY_NAME}/${FETCHMAIL_IMAGE_NAMESPACE}/${FETCHMAIL_IMAGE_NAME}:${FETCHMAIL_IMAGE_VERSION}
+FETCHMAIL_IMAGE_UNQUALIFIED=${FETCHMAIL_IMAGE_NAMESPACE}/${FETCHMAIL_IMAGE_NAME}:${FETCHMAIL_IMAGE_VERSION}
 
 # BUILD CONTAINER IMAGE
 # ==============================================================================
 PHONY:=container-image/build
 container-image/build:
-	${PODMAN_BIN} build \
+	${CONTAINER_RUNTIME} build \
 		--file Dockerfile \
 		--no-cache \
 		--pull \
 		--tag ${FETCHMAIL_IMAGE_FULLY_QUALIFIED} \
+		--tag ${FETCHMAIL_IMAGE_UNQUALIFIED} \
 		.
 
 # DELETE CONTAINER IMAGE
 # ==============================================================================
 PHONY:=container-image/delete
 container-image/delete:
-	- ${PODMAN_BIN} image rm ${FETCHMAIL_IMAGE_FULLY_QUALIFIED}
+	- ${CONTAINER_RUNTIME} image rm ${FETCHMAIL_IMAGE_FULLY_QUALIFIED} ${FETCHMAIL_IMAGE_UNQUALIFIED}
+	- ${CONTAINER_RUNTIME} image rm ${BASE_IMAGE_FULL}
 
 # PUSH CONTAINER IMAGE
 # ==============================================================================
 PHONY+=container-image/push
 container-image/push:
-	echo ${FETCHMAIL_IMAGE_REGISTRY_PASSWORD} | ${PODMAN_BIN} login ${FETCHMAIL_IMAGE_REGISTRY_HOST} --username ${FETCHMAIL_IMAGE_REGISTRY_USER} --password-stdin
+	echo ${FETCHMAIL_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${FETCHMAIL_IMAGE_REGISTRY_NAME} --username ${FETCHMAIL_IMAGE_REGISTRY_USER} --password-stdin
-	${PODMAN_BIN} push ${FETCHMAIL_IMAGE_FULLY_QUALIFIED}
+	${CONTAINER_RUNTIME} push ${FETCHMAIL_IMAGE_FULLY_QUALIFIED}
-	${PODMAN_BIN} logout ${FETCHMAIL_IMAGE_REGISTRY_HOST}
-
-# PUSH CONTAINER IMAGE TO DOCKER
-# ==============================================================================
-PHONY+=container-image/push-to-docker-daemon
-container-image/push-to-docker-daemon:
-	${PODMAN_BIN} push ${FETCHMAIL_IMAGE_FULLY_QUALIFIED} docker-daemon:${FETCHMAIL_IMAGE_FULLY_QUALIFIED}
 
 # PHONY
 # ==============================================================================

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3"
 services:
   postfixadmin-fetchmail:
     container_name: postfixadmin-fetchmail
-    image: git.cryptic.systems/volker.raschek/postfixadmin-fetchmail:latest
+    image: docker.io/volkerraschek/postfixadmin-fetchmail:latest
     environment:
     - DATABASE_TYPE=${DATABASE_TYPE}
     - DATABASE_USER=${DATABASE_USER}

manifest.tmpl

@@ -1,4 +1,4 @@
-image: git.cryptic.systems/volker.raschek/postfixadmin-fetchmail:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+image: volkerraschek/postfixadmin-fetchmail:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
@@ -7,11 +7,19 @@ tags:
   - "latest"
 {{/if}}
 manifests:
-  - image: git.cryptic.systems/volker.raschek/postfixadmin-fetchmail:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64
+  -
+    image: volkerraschek/postfixadmin-fetchmail:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64
     platform:
       architecture: amd64
       os: linux
-  - image: git.cryptic.systems/volker.raschek/postfixadmin-fetchmail:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
+  -
+    image: volkerraschek/postfixadmin-fetchmail:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm-v7
+    platform:
+      architecture: arm
+      os: linux
+      variant: v7
+  -
+    image: volkerraschek/postfixadmin-fetchmail:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
     platform:
       architecture: arm64
       os: linux

renovate.json

@@ -1,9 +1,17 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
+  "assignees": [ "volker.raschek" ],
-    "local>volker.raschek/renovate-config:default#master",
+  "automergeStrategy": "merge-commit",
-    "local>volker.raschek/renovate-config:container#master",
+  "automergeType": "pr",
-    "local>volker.raschek/renovate-config:actions#master",
+  "labels": [ "renovate" ],
-    "local>volker.raschek/renovate-config:regexp#master"
+  "packageRules": [
-  ]
+    {
+      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
+      "automerge": true,
+      "matchManagers": "droneci",
+      "matchUpdateTypes": [ "minor", "patch"]
+    }
+  ],
+  "rebaseLabel": "renovate/rebase",
+  "rebaseWhen": "behind-base-branch"
 }