chore(ci): use upstream container image registry

Reviewed-on: #54

.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/tmknom/markdownlint:0.23.1
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.43.0
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 50M
+      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:
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 25M
+      memory: 150M
   when:
     status:
     - changed
@@ -41,181 +48,499 @@ trigger:
   event:
     exclude:
     - tag
+
 ---
 kind: pipeline
 type: docker
-name: build-latest
+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/volkerraschek/build-image:latest
+  image: docker.io/plugins/docker:20.18.6
-  commands:
+  settings:
-  - make container-image/build
+    auto_tag: false
-  volumes:
+    dockerfile: Dockerfile
-  - name: docker_socket
+    dry_run: true
-    path: /var/run/docker.sock
+    force_tag: true
-  when:
+    no_cache: true
-    branch:
+    purge: true
-    - master
+    mirror:
+      from_secret: docker_io_mirror
+    registry: git.cryptic.systems
+    repo: git.cryptic.systems/volker.raschek/postfixadmin
+    tags: latest-amd64
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
 
-- name: push
+- name: email-notification
-  image: docker.io/volkerraschek/build-image:latest
-  commands:
-  - make container-image/push
   environment:
-    POSTFIXADMIN_IMAGE_REGISTRY_PASSWORD:
+    SMTP_FROM_ADDRESS:
-      from_secret: container_image_registry_password
+      from_secret: smtp_from_address
-  volumes:
+    SMTP_FROM_NAME:
-  - name: docker_socket
+      from_secret: smtp_from_name
-    path: /var/run/docker.sock
+    SMTP_HOST:
-  when:
-    branch:
-    - master
-    repo:
-    - volker.raschek/postfixadmin-docker
-
-- name: delete
-  image: docker.io/volkerraschek/build-image:latest
-  commands:
-  - make container-image/delete
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
-  when:
-    branch:
-    - master
-
-- name: notify
-  image: drillster/drone-email
-  environment:
-    PLUGIN_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
-      from_secret: smtp_mail_address
   when:
     status:
     - changed
     - failure
 
-volumes:
-- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 trigger:
-  event:
+  branch:
     exclude:
-    - tag
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/postfixadmin-docker
 
 ---
 kind: pipeline
 type: docker
-name: build-tagged
+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
+    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-docker
+
+---
+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/volkerraschek/build-image:latest
+  image: docker.io/plugins/docker:20.18.6
-  commands:
+  settings:
-  - make container-image/build POSTFIXADMIN_IMAGE_VERSION=${DRONE_TAG}
+    auto_tag: false
-  volumes:
+    dockerfile: Dockerfile
-  - name: docker_socket
+    force_tag: true
-    path: /var/run/docker.sock
+    no_cache: true
+    purge: true
+    mirror:
+      from_secret: docker_io_mirror
+    registry: git.cryptic.systems
+    repo: git.cryptic.systems/volker.raschek/postfixadmin
+    tags: latest-amd64
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
 
-- name: push
+- name: email-notification
-  image: docker.io/volkerraschek/build-image:latest
-  commands:
-  - make container-image/push POSTFIXADMIN_IMAGE_VERSION=${DRONE_TAG}
   environment:
-    POSTFIXADMIN_IMAGE_REGISTRY_PASSWORD:
+    SMTP_FROM_ADDRESS:
-      from_secret: container_image_registry_password
+      from_secret: smtp_from_address
-  volumes:
+    SMTP_FROM_NAME:
-  - name: docker_socket
+      from_secret: smtp_from_name
-    path: /var/run/docker.sock
+    SMTP_HOST:
-
-- name: delete
-  image: docker.io/volkerraschek/build-image:latest
-  commands:
-  - make container-image/delete POSTFIXADMIN_IMAGE_VERSION=${DRONE_TAG}
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
-
-- name: notify
-  image: drillster/drone-email
-  environment:
-    PLUGIN_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
-      from_secret: smtp_mail_address
   when:
     status:
     - changed
     - failure
 
-volumes:
+trigger:
-- name: docker_socket
+  branch:
-  host:
+  - master
-    path: /var/run/docker.sock
+  event:
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-docker
+
+---
+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
+  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
+    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:
+  - master
+  event:
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-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: docker.io/plugins/manifest:1.4.0
+  settings:
+    auto_tag: false
+    ignore_missing: true
+    spec: manifest.tmpl
+    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
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
+  when:
+    status:
+    - changed
+    - failure
+
+trigger:
+  branch:
+  - master
+  event:
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-docker
+
+---
+kind: pipeline
+type: kubernetes
+name: latest-sync
+
+clone:
+  disable: true
+
+depends_on:
+- 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 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:
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-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: docker.io/plugins/docker:20.18.6
+  settings:
+    auto_tag: true
+    auto_tag_suffix: amd64
+    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
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
+    build_args:
+    - POSTFIXADMIN_VERSION=${DRONE_TAG}
+
+- 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:
   event:
   - tag
   repo:
   - volker.raschek/postfixadmin-docker
+
 ---
 kind: pipeline
-type: kubernetes
+type: docker
-name: sync
+name: tagged-arm64-v8
+
+clone:
+  disable: true
 
 platform:
   os: linux
-  arch: amd64
+  arch: arm64
 
 steps:
-- name: github
+- name: clone
-  image: docker.io/appleboy/drone-git-push:latest
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
-  resources:
+
-    limits:
+- name: build
-      cpu: 50
+  image: docker.io/plugins/docker:20.18.6
-      memory: 25M
   settings:
-    branch: master
+    auto_tag: true
-    remote: ssh://git@github.com/volker-raschek/postfixadmin-docker.git
+    auto_tag_suffix: arm64-v8
-    force: true
+    dockerfile: Dockerfile
-    ssh_key:
+    force_tag: true
-      from_secret: ssh_key
+    no_cache: true
+    purge: true
+    mirror:
+      from_secret: docker_io_mirror
+    registry: git.cryptic.systems
+    repo: git.cryptic.systems/volker.raschek/postfixadmin
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
+    build_args:
+    - POSTFIXADMIN_VERSION=${DRONE_TAG}
 
 - 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:
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
   when:
     status:
     - changed
@@ -223,6 +548,123 @@ steps:
 
 trigger:
   event:
-  - push
+  - tag
+  repo:
+  - volker.raschek/postfixadmin-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: docker.io/plugins/manifest:1.4.0
+  settings:
+    auto_tag: true
+    ignore_missing: true
+    spec: manifest.tmpl
+    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
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
+  when:
+    status:
+    - changed
+    - failure
+
+trigger:
+  event:
+  - tag
+  repo:
+  - volker.raschek/postfixadmin-docker
+
+---
+kind: pipeline
+type: kubernetes
+name: tagged-sync
+
+clone:
+  disable: true
+
+depends_on:
+- tagged-manifest
+
+steps:
+- 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 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:
+  - tag
   repo:
   - volker.raschek/postfixadmin-docker

.markdownlint.yaml

@@ -128,8 +128,8 @@ MD041:
 # MD044/proper-names - Proper names should have the correct capitalization
 MD044:
   # List of proper names
-  names:
+  names: []
-  - PostfixAdmin
+  # - PostfixAdmin
   # Include code blocks
   code_blocks: false
 

Dockerfile

@@ -1,8 +1,7 @@
 FROM docker.io/library/php:7.4-apache
 
 # POSTFIXADMIN VERSION
-ARG POSTFIXADMIN_VERSION \
+ARG POSTFIXADMIN_VERSION
-    POSTFIXADMIN_SHA512
 
 # APACHE
 ENV APACHE_DOCUMENT_ROOT /var/www/html/public
@@ -24,45 +23,47 @@ ENV POSTFIXADMIN_DATABASE_TYPE=sqlite \
 # docker-entrypoint.sh dependencies
 RUN set -eux; \
   apt-get update; \
-  apt-get install --yes --no-install-recommends gosu; \
+  apt-get install --yes --no-install-recommends gosu apache2-utils; \
   rm --recursive --force /var/lib/apt/lists/*
 
 # Install required PHP extensions
 RUN set -ex; \
-  savedAptMark="$(apt-mark showmanual)"; \
+    savedAptMark="$(apt-mark showmanual)"; \
-  apt-get update; \
+    apt-get update; \
-  apt-get install --yes --no-install-recommends \
+    apt-get install --yes --no-install-recommends \
-    libc-client2007e-dev \
+      libc-client2007e-dev \
-    libkrb5-dev \
+      libkrb5-dev \
-    libpq-dev \
+      libpq-dev \
-    libsqlite3-dev; \
+      libsqlite3-dev; \
-  docker-php-ext-configure imap --with-imap-ssl --with-kerberos; \
+    docker-php-ext-configure imap --with-imap-ssl --with-kerberos; \
-  docker-php-ext-install -j "$(nproc)" \
+    docker-php-ext-install -j "$(nproc)" \
-    imap \
+      imap \
-    pdo_mysql \
+      pdo_mysql \
-    pdo_pgsql \
+      pdo_pgsql \
-    pdo_sqlite \
+      pdo_sqlite \
-    pgsql; \
+      pgsql; \
-  apt-mark auto '.*' > /dev/null; \
+    apt-mark auto '.*' > /dev/null; \
-  apt-mark manual $savedAptMark; \
+    apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+      ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-    | awk '/=>/ { print $3 }' \
+      | awk '/=>/ { print $3 }' \
-    | sort -u \
+      | sort -u \
-    | xargs -r dpkg-query -S \
+      | xargs -r dpkg-query -S \
-    | cut -d: -f1 \
+      | cut -d: -f1 \
-    | sort -u \
+      | sort -u \
-    | xargs -rt apt-mark manual; \
+      | xargs -rt apt-mark manual; \
-  apt-get purge --yes --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+    if [ ! -z ${POSTFIXADMIN_VERSION} ]; then \
-  rm --recursive --force /var/lib/apt/lists/*
+      curl --fail --silent --show-error --location "https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${POSTFIXADMIN_VERSION}.tar.gz" --output postfixadmin.tar.gz; \
+      tar --extract --file postfixadmin.tar.gz --directory /var/www/html --strip-components=1; \
+      rm postfixadmin.tar.gz; \
+    else \
+      apt-get install --yes git; \
+      git clone https://github.com/postfixadmin/postfixadmin.git /var/www/html; \
+    fi; \
+    apt-get purge --yes --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+    rm --recursive --force /var/lib/apt/lists/*
 
-RUN set -eu; \
+RUN mkdir --parents /var/www/html/templates_c; \
-  curl --fail --silent --show-error --location "https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${POSTFIXADMIN_VERSION}.tar.gz" --output postfixadmin.tar.gz ; \
+    chown --recursive www-data:www-data /var/www/html
-  echo "${POSTFIXADMIN_SHA512} *postfixadmin.tar.gz" | sha512sum -c -; \
-  tar --extract --file postfixadmin.tar.gz --directory /var/www/html --strip-components=1; \
-  rm postfixadmin.tar.gz; \
-  # Does not exist in tarball but is required
-  mkdir --parents /var/www/html/templates_c; \
-  chown --recursive www-data:www-data /var/www/html
 
 COPY entrypoint.sh /usr/local/bin/
 

Makefile

@@ -1,49 +1,47 @@
-POSTFIXADMIN_VERSION:=3.3.10
+# POSTFIXADMIN_VERSION
-POSTFIXADMIN_SHA512:=e00fc9ea343a928976d191adfa01020ee0c6ddbe80a39e01ca2ee414a18247958f033970f378fe4a9974636172a5e094e57117ee9ac7b930c592f433097a7aca
+# Only required to install a specify version
+POSTFIXADMIN_VERSION?=3.3.15 # renovate: datasource=github-tags depName=postfixadmin/postfixadmin extractVersion='postfixadmin-(?<version>\\d+\\.\\d+\\.\\d+)$'
 
-# CONTAINER_RUNTIME
+# PODMAN_BIN's and tools
-# The CONTAINER_RUNTIME variable will be used to specified the path to a
+PODMAN_BIN?=$(shell which podman)
-# container runtime. This is needed to start and run a container image.
-CONTAINER_RUNTIME?=$(shell which docker)
 
-# POSTFIXADMIN_IMAGE_REGISTRY_NAME
+# POSTFIXADMIN_IMAGE
-# Defines the name of the new container to be built using several variables.
+POSTFIXADMIN_IMAGE_REGISTRY_HOST?=git.cryptic.systems
-POSTFIXADMIN_IMAGE_REGISTRY_NAME:=docker.io
+POSTFIXADMIN_IMAGE_REPOSITORY?=volker.raschek/postfixadmin
-POSTFIXADMIN_IMAGE_REGISTRY_USER:=volkerraschek
-
-POSTFIXADMIN_IMAGE_NAMESPACE?=${POSTFIXADMIN_IMAGE_REGISTRY_USER}
-POSTFIXADMIN_IMAGE_NAME:=postfixadmin
 POSTFIXADMIN_IMAGE_VERSION?=latest
-POSTFIXADMIN_IMAGE_FULLY_QUALIFIED=${POSTFIXADMIN_IMAGE_REGISTRY_NAME}/${POSTFIXADMIN_IMAGE_NAMESPACE}/${POSTFIXADMIN_IMAGE_NAME}:${POSTFIXADMIN_IMAGE_VERSION}
+POSTFIXADMIN_IMAGE_FULLY_QUALIFIED=${POSTFIXADMIN_IMAGE_REGISTRY_HOST}/${POSTFIXADMIN_IMAGE_REPOSITORY}:${POSTFIXADMIN_IMAGE_VERSION}
-POSTFIXADMIN_IMAGE_UNQUALIFIED=${POSTFIXADMIN_IMAGE_NAMESPACE}/${POSTFIXADMIN_IMAGE_NAME}:${POSTFIXADMIN_IMAGE_VERSION}
 
 # BUILD CONTAINER IMAGE
 # ==============================================================================
 PHONY:=container-image/build
 container-image/build:
-	${CONTAINER_RUNTIME} build \
+	${PODMAN_BIN} build \
 		--build-arg POSTFIXADMIN_VERSION=${POSTFIXADMIN_VERSION} \
-		--build-arg POSTFIXADMIN_SHA512=${POSTFIXADMIN_SHA512} \
 		--file Dockerfile \
 		--no-cache \
 		--pull \
 		--tag ${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED} \
-		--tag ${POSTFIXADMIN_IMAGE_UNQUALIFIED} \
 		.
 
 # DELETE CONTAINER IMAGE
 # ==============================================================================
 PHONY:=container-image/delete
 container-image/delete:
-	- ${CONTAINER_RUNTIME} image rm ${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED} ${POSTFIXADMIN_IMAGE_UNQUALIFIED}
+	- ${PODMAN_BIN} image rm ${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED}
-	- ${CONTAINER_RUNTIME} image rm ${PHP_IMAGE_FULL}
 
 # PUSH CONTAINER IMAGE
 # ==============================================================================
 PHONY+=container-image/push
 container-image/push:
-	echo ${POSTFIXADMIN_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${POSTFIXADMIN_IMAGE_REGISTRY_NAME} --username ${POSTFIXADMIN_IMAGE_REGISTRY_USER} --password-stdin
+	echo ${POSTFIXADMIN_IMAGE_REGISTRY_PASSWORD} | ${PODMAN_BIN} login ${POSTFIXADMIN_IMAGE_REGISTRY_NAME} --username ${POSTFIXADMIN_IMAGE_REGISTRY_USER} --password-stdin
-	${CONTAINER_RUNTIME} push ${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED}
+	${PODMAN_BIN} push ${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED}
+	${PODMAN_BIN} logout ${POSTFIXADMIN_IMAGE_REGISTRY_HOST}
+
+# PUSH CONTAINER IMAGE TO DOCKER
+# ==============================================================================
+PHONY+=container-image/push-to-docker-daemon
+container-image/push-to-docker-daemon:
+	${PODMAN_BIN} push ${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED} docker-daemon:${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED}
 
 # PHONY
 # ==============================================================================

README.md

@@ -23,26 +23,31 @@ prefix `POSTFIXADMIN_`. You can take an example
 [configuration](https://github.com/postfixadmin/postfixadmin/blob/master/config.inc.php)
 from the upstream project.
 
-| name                                | default                     |
+| name                                | default                                     |
-| ----------------------------------- | --------------------------- |
+| ----------------------------------- | ------------------------------------------- |
-| `POSTFIXADMIN_ADMIN_EMAIL`          |                             |
+| `POSTFIXADMIN_ADMIN_EMAIL`          |                                             |
-| `POSTFIXADMIN_ADMIN_SMTP_PASSWORD`  |                             |
+| `POSTFIXADMIN_ADMIN_SMTP_PASSWORD`  |                                             |
-| `POSTFIXADMIN_ADMIN_NAME`           |                             |
+| `POSTFIXADMIN_ADMIN_NAME`           |                                             |
-| `POSTFIXADMIN_DATABASE_TYPE`        | `sqlite`                    |
+| `POSTFIXADMIN_DATABASE_TYPE`        | `sqlite`                                    |
-| `POSTFIXADMIN_DATABASE_USER`        |                             |
+| `POSTFIXADMIN_DATABASE_USER`        |                                             |
-| `POSTFIXADMIN_DATABASE_PASSWORD`    |                             |
+| `POSTFIXADMIN_DATABASE_PASSWORD`    |                                             |
-| `POSTFIXADMIN_DATABASE_HOST`        |                             |
+| `POSTFIXADMIN_DATABASE_HOST`        |                                             |
-| `POSTFIXADMIN_DATABASE_PORT`        |                             |
+| `POSTFIXADMIN_DATABASE_PORT`        |                                             |
-| `POSTFIXADMIN_DATABASE_NAME`        | `/var/tmp/postfixadmin.db`  |
+| `POSTFIXADMIN_DATABASE_NAME`        | `/var/tmp/postfixadmin.db`                  |
-| `POSTFIXADMIN_DEFAULT_LANGUAGE`     | `en`                        |
+| `POSTFIXADMIN_DEFAULT_LANGUAGE`     | `en`                                        |
-| `POSTFIXADMIN_DATABASE_USE_SSL`     |                             |
+| `POSTFIXADMIN_DATABASE_USE_SSL`     |                                             |
-| `POSTFIXADMIN_DATABASE_KEY`         |                             |
+| `POSTFIXADMIN_DATABASE_KEY`         |                                             |
-| `POSTFIXADMIN_DATABASE_CERT`        |                             |
+| `POSTFIXADMIN_DATABASE_CERT`        |                                             |
-| `POSTFIXADMIN_DATABASE_CA`          |                             |
+| `POSTFIXADMIN_DATABASE_CA`          |                                             |
-| `POSTFIXADMIN_DATABASE_PREFIX`      |                             |
+| `POSTFIXADMIN_DATABASE_PREFIX`      |                                             |
-| `POSTFIXADMIN_ENCRYPT`              | `md5crypt`                  |
+| `POSTFIXADMIN_ENCRYPT`              | `md5crypt`                                  |
-| `POSTFIXADMIN_SMTP_SERVER`          | `localhost`                 |
+| `POSTFIXADMIN_SMTP_SERVER`          | `localhost`                                 |
-| `POSTFIXADMIN_SMTP_PORT`            | `25`                        |
+| `POSTFIXADMIN_SMTP_PORT`            | `25`                                        |
+| `POSTFIXADMIN_SMTP_CLIENT`          |                                             |
+| `POSTFIXADMIN_SHOW_FOOTER_TEXT`     | `YES`                                       |
+| `POSTFIXADMIN_FOOTER_TEXT`          | `Return to change-this-to-your.domain.tld`  |
+| `POSTFIXADMIN_FOOTER_LINK`          | `http://change-this-to-your.domain.tld`     |
+| `POSTFIXADMIN_FETCHMAIL`            | `YES`                                       |
 
 ### POSTFIXADMIN_ADMIN_EMAIL
 
@@ -173,5 +178,35 @@ are documented
 ### POSTFIXADMIN_SETUP_PASSWORD
 
 To login into the `setup.php` page is the setup password required. This can be
-defined via the variable `POSTFIXADMIN_SETUP_PASSWORD`. The password will not be
+defined via the variable `POSTFIXADMIN_SETUP_PASSWORD`. The password will be
-configured in the `config.local.php` as plain text. It will be encrypted.
+hashed via bcrypt and used as value for the setting `$CONF['setup_password']` in
+the config file `config.local.php`.
+
+### POSTFIXADMIN_SMTP_CLIENT
+
+Hostname (FQDN) of the server hosting PostfixAdmin used in the `HELO` when
+sending emails from PostfixAdmin. The value of the environment will be
+configured as the following config setting and is empty by default:
+`$CONF['smtp_client']`.
+
+### POSTFIXADMIN_SMTP_SERVER
+
+Hostname (FQDN) of your mail server. The default value is `localhost`. The value
+of the environment will be configured as the following config setting:
+`$CONF['smtp_server']`.
+
+### POSTFIXADMIN_SMTP_PORT
+
+Port of your mail server. The default value is `25`. The value of the
+environment will be configured as the following config setting:
+`$CONF['smtp_port']`.
+
+### POSTFIXADMIN_SHOW_FOOTER_TEXT
+
+Enable or disable via `YES` or `NO` the footer text displayed on all sites. Use
+`POSTFIXADMIN_FOOTER_TEXT` and `POSTFIX_FOOTER_LINK` to customize the text.
+
+### POSTFIXADMIN_FETCHMAIL
+
+Enable or disable via `YES` or `NO` the fetchmail tab. It has nothing todo with
+the fetchmail cron job.

entrypoint.sh

@@ -40,6 +40,10 @@ if [ "${POSTFIXADMIN_DATABASE_TYPE}" = 'sqlite' ]; then
   fi
 fi
 
+# bycrypt POSTFIXADMIN_SETUP_PASSWORD
+if [ ! -z ${POSTFIXADMIN_SETUP_PASSWORD+x} ]; then
+  POSTFIXADMIN_SETUP_PASSWORD=$(htpasswd -bnBC 10 "" "${POSTFIXADMIN_SETUP_PASSWORD}" | tr -d ':\n')
+fi
 
 # create config.local.pgp with vaules from env with POSTFIXADMIN_ prefix
 POSTFIXADMIN_ENV_VARS=($(env | sort | grep --perl-regexp '^POSTFIXADMIN_.*'))

manifest.tmpl

@@ -0,0 +1,20 @@
+image: git.cryptic.systems/volker.raschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+  - "latest"
+{{/if}}
+manifests:
+  -
+    image: git.cryptic.systems/volker.raschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: git.cryptic.systems/volker.raschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
+    platform:
+      architecture: arm64
+      os: linux
+      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"
+  ]
+}