chore(ci): use upstream container image registry

Reviewed-on: #66

.drone.yml

@@ -3,35 +3,42 @@ kind: pipeline
 type: kubernetes
 name: linter
 
+clone:
+  disable: true
+
 platform:
   os: linux
-  arch: amd64
 
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
+
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.28.1
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.43.0
   resources:
     limits:
-      cpu: 50
-      memory: 50M
+      cpu: 150
+      memory: 150M
 
 - name: email-notification
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
   when:
     status:
     - changed
@@ -41,353 +48,612 @@ trigger:
   event:
     exclude:
     - tag
+
+---
+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
+  settings:
+    auto_tag: false
+    dockerfile: Dockerfile
+    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
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
+
+- 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
+  when:
+    status:
+    - changed
+    - failure
+
+trigger:
+  branch:
+    exclude:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
+
+---
+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
+  settings:
+    auto_tag: false
+    dockerfile: Dockerfile
+    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
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
+
+- 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
+  when:
+    status:
+    - changed
+    - failure
+
+trigger:
+  branch:
+    exclude:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
+
 ---
 kind: pipeline
 type: docker
 name: latest-amd64
 
+clone:
+  disable: true
+
+depends_on:
+- linter
+
 platform:
   os: linux
   arch: amd64
 
 steps:
-- name: build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: false
-    tags: latest-amd64
-    repo: volkerraschek/fetchmail
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
-  when:
-    branch:
-    - master
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
-- name: notify
-  image: drillster/drone-email
+- name: build
+  image: docker.io/plugins/docker:20.18.6
+  settings:
+    auto_tag: false
+    dockerfile: Dockerfile
+    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
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
+
+- name: email-notification
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
     - failure
 
-volumes:
-- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 trigger:
+  branch:
+  - master
   event:
-    exclude:
-    - tag
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
 
 ---
 kind: pipeline
 type: docker
-name: latest-armv7
+name: latest-arm64-v8
+
+clone:
+  disable: true
+
+depends_on:
+- linter
 
 platform:
   os: linux
-  arch: arm
+  arch: arm64
 
 steps:
-- name: build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: false
-    tags: latest-armv7
-    repo: volkerraschek/fetchmail
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    no_cache: true
-  when:
-    branch:
-    - master
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
-- name: notify
-  image: drillster/drone-email
+- name: build
+  image: docker.io/plugins/docker:20.18.6
+  settings:
+    auto_tag: false
+    dockerfile: Dockerfile
+    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
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
+
+- name: email-notification
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
     - failure
 
-volumes:
-- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 trigger:
+  branch:
+  - master
   event:
-    exclude:
-    - tag
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
 
 ---
 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: plugins/manifest
+  image: docker.io/plugins/manifest:1.4.0
   settings:
     auto_tag: false
     ignore_missing: true
     spec: manifest.tmpl
     username:
-      from_secret: container_image_registry_user
+      from_secret: git_cryptic_systems_container_registry_user
     password:
-      from_secret: container_image_registry_password
+      from_secret: git_cryptic_systems_container_registry_password
 
-- name: notify
-  image: docker.io/drillster/drone-email:latest
+- name: email-notification
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
   when:
     status:
     - 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-amd64
-- latest-armv7
+- latest-manifest
+
+steps:
+- 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:
+  - master
   event:
-    exclude:
-    - tag
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
 
 ---
 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: plugins/docker
+  image: docker.io/plugins/docker:20.18.6
   settings:
-    dockerfile: Dockerfile
     auto_tag: true
     auto_tag_suffix: amd64
-    repo: volkerraschek/fetchmail
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
+    dockerfile: Dockerfile
+    force_tag: true
     no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
+    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
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
 
-- name: notify
-  image: drillster/drone-email
+- name: email-notification
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
     - failure
 
-volumes:
-- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 trigger:
   event:
   - tag
   repo:
-  - volker.raschek/fetchmail-docker
+  - volker.raschek/postfixadmin-fetchmail-docker
 
 ---
 kind: pipeline
 type: docker
-name: tagged-armv7
+name: tagged-arm64-v8
+
+clone:
+  disable: true
 
 platform:
   os: linux
-  arch: arm
+  arch: arm64
 
 steps:
-- name: build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: true
-    auto_tag_suffix: armv7
-    repo: volkerraschek/fetchmail
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
 
-- name: notify
-  image: drillster/drone-email
+- name: build
+  image: docker.io/plugins/docker:20.18.6
+  settings:
+    auto_tag: true
+    auto_tag_suffix: arm64-v8
+    dockerfile: Dockerfile
+    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
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
+
+- name: email-notification
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
     - failure
 
-volumes:
-- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 trigger:
   event:
   - tag
   repo:
-  - volker.raschek/fetchmail-docker
+  - volker.raschek/postfixadmin-fetchmail-docker
 
 ---
 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: plugins/manifest
+  image: docker.io/plugins/manifest:1.4.0
   settings:
     auto_tag: true
     ignore_missing: true
     spec: manifest.tmpl
     username:
-      from_secret: container_image_registry_user
+      from_secret: git_cryptic_systems_container_registry_user
     password:
-      from_secret: container_image_registry_password
+      from_secret: git_cryptic_systems_container_registry_password
 
-- name: notify
-  image: docker.io/drillster/drone-email:latest
+- name: email-notification
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
   when:
     status:
     - changed
     - failure
 
-depends_on:
-- tagged-amd64
-- tagged-armv7
-
 trigger:
   event:
   - tag
   repo:
-  - volker.raschek/fetchmail-docker
+  - volker.raschek/postfixadmin-fetchmail-docker
 
 ---
 kind: pipeline
 type: kubernetes
-name: sync
+name: tagged-sync
 
-platform:
-  os: linux
-  arch: amd64
+clone:
+  disable: true
+
+depends_on:
+- tagged-manifest
 
 steps:
-- name: github
-  image: docker.io/appleboy/drone-git-push:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  settings:
-    branch: master
-    remote: ssh://git@github.com/volker-raschek/fetchmail-docker.git
-    force: true
-    ssh_key:
-      from_secret: ssh_key
+- 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:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
   when:
     status:
     - changed
@@ -395,6 +661,6 @@ steps:
 
 trigger:
   event:
-  - push
+  - tag
   repo:
-  - volker.raschek/fetchmail-docker
+  - volker.raschek/postfixadmin-fetchmail-docker

Dockerfile

@@ -1,12 +1,28 @@
-FROM docker.io/library/alpine:3.11.2
+FROM docker.io/library/alpine:3.21.3
+
+# 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 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,47 +1,45 @@
-# CONTAINER_RUNTIME
-# 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 docker)
+# PODMAN_BIN's and tools
+PODMAN_BIN?=$(shell which podman)
 
-# FETCHMAIL_IMAGE_REGISTRY_NAME
-# Defines the name of the new container to be built using several variables.
-FETCHMAIL_IMAGE_REGISTRY_NAME:=docker.io
-FETCHMAIL_IMAGE_REGISTRY_USER:=volkerraschek
-
-FETCHMAIL_IMAGE_NAMESPACE?=${FETCHMAIL_IMAGE_REGISTRY_USER}
-FETCHMAIL_IMAGE_NAME:=fetchmail
+# FETCHMAIL_IMAGE
+FETCHMAIL_IMAGE_REGISTRY_HOST?=git.cryptic.systems
+FETCHMAIL_IMAGE_REPOSITORY?=volker.raschek/postfixadmin-fetchmail
 FETCHMAIL_IMAGE_VERSION?=latest
-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}
+FETCHMAIL_IMAGE_FULLY_QUALIFIED=${FETCHMAIL_IMAGE_REGISTRY_HOST}/${FETCHMAIL_IMAGE_REPOSITORY}:${FETCHMAIL_IMAGE_VERSION}
 
 # BUILD CONTAINER IMAGE
 # ==============================================================================
 PHONY:=container-image/build
 container-image/build:
-	${CONTAINER_RUNTIME} build \
+	${PODMAN_BIN} 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:
-	- ${CONTAINER_RUNTIME} image rm ${FETCHMAIL_IMAGE_FULLY_QUALIFIED} ${FETCHMAIL_IMAGE_UNQUALIFIED}
-	- ${CONTAINER_RUNTIME} image rm ${BASE_IMAGE_FULL}
+	- ${PODMAN_BIN} image rm ${FETCHMAIL_IMAGE_FULLY_QUALIFIED}
 
 # PUSH CONTAINER IMAGE
 # ==============================================================================
 PHONY+=container-image/push
 container-image/push:
-	echo ${FETCHMAIL_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${FETCHMAIL_IMAGE_REGISTRY_NAME} --username ${FETCHMAIL_IMAGE_REGISTRY_USER} --password-stdin
-	${CONTAINER_RUNTIME} push ${FETCHMAIL_IMAGE_FULLY_QUALIFIED}
+	echo ${FETCHMAIL_IMAGE_REGISTRY_PASSWORD} | ${PODMAN_BIN} login ${FETCHMAIL_IMAGE_REGISTRY_HOST} --username ${FETCHMAIL_IMAGE_REGISTRY_USER} --password-stdin
+	${PODMAN_BIN} 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
 # ==============================================================================
 # Declare the contents of the PHONY variable as phony.  We keep that information
 # in a variable so we can use it in if_changed.
-.PHONY: ${PHONY}
+.PHONY: ${PHONY}

README.md

@@ -1,15 +1,17 @@
-# fetchmail-docker
+# PostfixAdmin's fetchmail
 
-[![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/fetchmail-docker/status.svg)](https://drone.cryptic.systems/volker.raschek/fetchmail-docker)
-[![Docker Pulls](https://img.shields.io/docker/pulls/volkerraschek/fetchmail)](https://hub.docker.com/r/volkerraschek/fetchmail)
+[![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/postfixadmin-fetchmail-docker/status.svg)](https://drone.cryptic.systems/volker.raschek/postfixadmin-fetchmail-docker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/volkerraschek/postfixadmin-fetchmail)](https://hub.docker.com/r/volkerraschek/postfixadmin-fetchmail)
 
 This project contains all sources to build the container image
-`docker.io/volkerraschek/fetchmail`. The primary goal of the image is to fetch
-mails from external servers and forward them to on local running mail server.
+`docker.io/volkerraschek/postfixadmin-fetchmail`. The primary goal of the image
+is to fetch mails from external servers and forward them to on local running
+mail server.
 
 The configuration file will be automatically generated based on information from
-a database. As table the fetchmail table from the schema of
-[postfixadmin](https://github.com/postfixadmin/postfixadmin) is expected.
+a supported database backend of
+[postfixadmin](https://github.com/postfixadmin/postfixadmin). The information
+are stored in the table `fetchmail` of the database scheme of PostfixAdmin.
 
 ## Usage
 
@@ -25,6 +27,7 @@ $ docker run \
   --rm \
   --env DATABASE_TYPE: Pg \
   --env DATABASE_HOST: postgres \
+  --env DATABASE_PORT: 5432 \
   --env DATABASE_NAME: postgres \
   --env DATABASE_USER: fetchmail \
   --env DATABASE_PASSWORD: MySecretPassword \
@@ -39,6 +42,7 @@ $ docker run \
   --rm \
   --env DATABASE_TYPE: my \
   --env DATABASE_HOST: root \
+  --env DATABASE_PORT: 3306 \
   --env DATABASE_NAME: mysql \
   --env DATABASE_USER: fetchmail \
   --env DATABASE_PASSWORD: MySecretPassword \
@@ -62,18 +66,47 @@ services:
     environment:
     - DATABASE_TYPE=${DATABASE_TYPE}
     - DATABASE_HOST=${DATABASE_HOST}
+    - DATABASE_HOST=${DATABASE_PORT}
     - DATABASE_NAME=${DATABASE_NAME}
     - DATABASE_USER=${DATABASE_USER}
     - DATABASE_PASSWORD=${DATABASE_PASSWORD}
     network_mode: host
 ```
 
-## Build container image manually
+## Environment variables
 
-To build the images manually check out the repository on
-[github](https://github.com/volker-raschek/fetchmail-docker) with git and use
-the make command to build the container image.
+### DATABASE_TYPE
 
-```bash
-make container-image/build
-```
+Currently will be only postgres, mysql and mariadb supported. About the
+environment variable `DATABASE_TYPE` can the backend type defined. The value is
+required.
+
+| database type | value |
+| ------------- | ----- |
+| mysql/mariadb | `my`  |
+| postgres      | `Pg`  |
+
+### DATABASE_USER
+
+The environment variable `DATABASE_USER` is undefined and required. The value
+contains the database user which one fetchmail use to login.
+
+### DATABASE_PASSWORD
+
+The environment variable `DATABASE_PASSWORD` is undefined and required. The value
+contains the password of the database user which one fetchmail use to login.
+
+### DATABASE_HOST
+
+The environment variable `DATABASE_HOST` is undefined and required. The value
+contains the DNS name or IP address of the host, where the database is hosted.
+
+### DATABASE_PORT
+
+The environment variable `DATABASE_PORT` is undefined and required. The value
+contains the port of the host, where the database is listen on.
+
+### DATABASE_NAME
+
+The environment variable `DATABASE_NAME` is undefined and required. The value
+contains the name of the database against which should be logged in.

docker-compose.yml

@@ -1,12 +1,14 @@
 version: "3"
 services:
-  fetchmail:
-    container_name: fetchmail
-    image: volkerraschek/fetchmail-docker:latest
+  postfixadmin-fetchmail:
+    container_name: postfixadmin-fetchmail
+    image: git.cryptic.systems/volker.raschek/postfixadmin-fetchmail:latest
     environment:
     - DATABASE_TYPE=${DATABASE_TYPE}
-    - DATABASE_HOST=${DATABASE_HOST}
-    - DATABASE_NAME=${DATABASE_NAME}
     - DATABASE_USER=${DATABASE_USER}
     - DATABASE_PASSWORD=${DATABASE_PASSWORD}
+    - DATABASE_HOST=${DATABASE_HOST}
+    - DATABASE_PORT=${DATABASE_PORT}
+    - DATABASE_NAME=${DATABASE_NAME}
     network_mode: host
+    privileged: true

fetchmail.pl

@@ -15,10 +15,11 @@ use LockFile::Simple qw(lock trylock unlock);
 
 # database backend - uncomment one of these
 our $db_type=$ENV{'DATABASE_TYPE'};
-our $db_host=$ENV{'DATABASE_HOST'};
-our $db_name=$ENV{'DATABASE_NAME'};
 our $db_username=$ENV{'DATABASE_USER'};
 our $db_password=$ENV{'DATABASE_PASSWORD'};
+our $db_host=$ENV{'DATABASE_HOST'};
+our $db_port=$ENV{'DATABASE_PORT'};
+our $db_name=$ENV{'DATABASE_NAME'};
 
 # instead of changing this script, you can put your settings to /etc/mail/postfixadmin/fetchmail.conf
 # just use perl syntax there to fill the variables listed above (without the "our" keyword). Example:
@@ -34,7 +35,7 @@ openlog("fetchmail-all", "pid", "mail");
 
 sub log_and_die {
   my($message) = @_;
-  syslog("err", $message);
+  printf "err: %s\n", $message;
   die $message;
 }
 
@@ -60,7 +61,7 @@ if (-e $configfile) {
 }
 
 if($db_type eq "Pg" || $db_type eq "mysql") {
-  $dsn = "DBI:$db_type:database=$db_name;host=$db_host";
+  $dsn = "DBI:$db_type:database=$db_name;host=$db_host;port=$db_port";
 } else {
   log_and_die "unsupported db_type $db_type";
 }
@@ -89,7 +90,7 @@ my (%config);
 map{
   my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$usessl,$sslcertck,$sslcertpath,$sslfingerprint)=@$_;
 
-  syslog("info","fetch ${src_user}@${src_server} for ${mailbox}");
+  printf "info: fetch %s@%s for %s\n", ${src_user}, ${src_server}, ${mailbox};
 
   $cmd="user '${src_user}' there with password '".decode_base64($src_password)."'";
   $cmd.=" folder '${src_folder}'" if ($src_folder);
@@ -111,7 +112,8 @@ set postmaster "postmaster"
 set nobouncemail
 set no spambounce
 set properties ""
-set syslog
+set no syslog
+set logfile /dev/stdout
 
 poll ${src_server} with proto ${protocol}
   $cmd
@@ -128,6 +130,9 @@ TXT
 
   $sql="UPDATE fetchmail SET returned_text=".$dbh->quote($ret).", date=now() WHERE id=".$id;
   $dbh->do($sql);
+
+  printf "info: fetched mails of %s@%s for %s\n", ${src_user}, ${src_server}, ${mailbox};
+
 }@{$dbh->selectall_arrayref($sql)};
 
 $lockmgr->unlock($lock_file);

manifest.tmpl

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

renovate.json

@@ -0,0 +1,9 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "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"
+  ]
+}