.drone.yml

@@ -3,42 +3,34 @@ kind: pipeline
 type: kubernetes
 name: linter
 
-clone:
-  disable: true
-
 platform:
   os: linux
 
 steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
-
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.42.0
+  image: docker.io/volkerraschek/markdownlint:0.30.0
   resources:
     limits:
-      cpu: 150
+      cpu: 50
-      memory: 150M
+      memory: 50M
 
 - name: email-notification
   environment:
-    SMTP_FROM_ADDRESS:
+    PLUGIN_HOST:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
       from_secret: smtp_host
-    SMTP_USERNAME:
+    PLUGIN_USERNAME:
       from_secret: smtp_username
-    SMTP_PASSWORD:
+    PLUGIN_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  image: docker.io/drillster/drone-email:latest
   resources:
     limits:
-      cpu: 150
+      cpu: 50
-      memory: 150M
+      memory: 25M
   when:
     status:
     - changed
@@ -54,57 +46,113 @@ 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.3.1
-
 - name: build
-  image: docker.io/plugins/docker:20.18.4
+  image: plugins/docker
   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
     tags: latest-amd64
+    repo: volkerraschek/markdownlint
     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
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
 
-- name: email-notification
+- name: notify
+  image: drillster/drone-email
   environment:
-    SMTP_FROM_ADDRESS:
+    PLUGIN_HOST:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
       from_secret: smtp_host
-    SMTP_USERNAME:
+    PLUGIN_USERNAME:
       from_secret: smtp_username
-    SMTP_PASSWORD:
+    PLUGIN_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
   when:
     status:
     - changed
     - failure
 
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
+depends_on:
+- linter
+
+trigger:
+  branch:
+    exclude:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/postfixadmin-docker
+
+---
+kind: pipeline
+type: docker
+name: dry-run-arm-v7
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: build
+  image: plugins/docker
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: false
+    dry_run: true
+    tags: latest-arm-v7
+    repo: volkerraschek/postfixadmin
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+    no_cache: true
+
+- name: notify
+  image: drillster/drone-email
+  environment:
+    PLUGIN_HOST:
+      from_secret: smtp_host
+    PLUGIN_USERNAME:
+      from_secret: smtp_username
+    PLUGIN_PASSWORD:
+      from_secret: smtp_password
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+  when:
+    status:
+    - changed
+    - failure
+
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
+depends_on:
+- linter
+
 trigger:
   branch:
     exclude:
@@ -120,57 +168,52 @@ 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.3.1
-
 - name: build
-  image: docker.io/plugins/docker:20.18.4
+  image: plugins/docker
   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
     tags: latest-arm64-v8
+    repo: volkerraschek/postfixadmin
     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
+- name: notify
+  image: drillster/drone-email
   environment:
-    SMTP_FROM_ADDRESS:
+    PLUGIN_HOST:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
       from_secret: smtp_host
-    SMTP_USERNAME:
+    PLUGIN_USERNAME:
       from_secret: smtp_username
-    SMTP_PASSWORD:
+    PLUGIN_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
   when:
     status:
     - changed
     - failure
 
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
+depends_on:
+- linter
+
 trigger:
   branch:
     exclude:
@@ -186,56 +229,110 @@ 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.3.1
-
 - name: build
-  image: docker.io/plugins/docker:20.18.4
+  image: plugins/docker
   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
     tags: latest-amd64
+    repo: volkerraschek/postfixadmin
     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
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
 
-- name: email-notification
+- name: notify
+  image: drillster/drone-email
   environment:
-    SMTP_FROM_ADDRESS:
+    PLUGIN_HOST:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
       from_secret: smtp_host
-    SMTP_USERNAME:
+    PLUGIN_USERNAME:
       from_secret: smtp_username
-    SMTP_PASSWORD:
+    PLUGIN_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
   when:
     status:
     - changed
     - failure
 
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
+depends_on:
+- linter
+
+trigger:
+  branch:
+  - master
+  event:
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-docker
+
+---
+kind: pipeline
+type: docker
+name: latest-arm-v7
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: build
+  image: plugins/docker
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: false
+    tags: latest-arm-v7
+    repo: volkerraschek/postfixadmin
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+    no_cache: true
+
+- name: notify
+  image: drillster/drone-email
+  environment:
+    PLUGIN_HOST:
+      from_secret: smtp_host
+    PLUGIN_USERNAME:
+      from_secret: smtp_username
+    PLUGIN_PASSWORD:
+      from_secret: smtp_password
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+  when:
+    status:
+    - changed
+    - failure
+
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
+depends_on:
+- linter
+
 trigger:
   branch:
   - master
@@ -250,56 +347,51 @@ 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.3.1
-
 - name: build
-  image: docker.io/plugins/docker:20.18.4
+  image: plugins/docker
   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
     tags: latest-arm64-v8
+    repo: volkerraschek/postfixadmin
     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
+- name: notify
+  image: drillster/drone-email
   environment:
-    SMTP_FROM_ADDRESS:
+    PLUGIN_HOST:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
       from_secret: smtp_host
-    SMTP_USERNAME:
+    PLUGIN_USERNAME:
       from_secret: smtp_username
-    SMTP_PASSWORD:
+    PLUGIN_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
   when:
     status:
     - changed
     - failure
 
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
+depends_on:
+- linter
+
 trigger:
   branch:
   - master
@@ -314,114 +406,42 @@ 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.3.1
-
 - name: build-manifest
-  image: docker.io/plugins/manifest:1.4.0
+  image: plugins/manifest
   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
+- name: notify
+  image: docker.io/drillster/drone-email:latest
   environment:
-    SMTP_FROM_ADDRESS:
+    PLUGIN_HOST:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
       from_secret: smtp_host
-    SMTP_USERNAME:
+    PLUGIN_USERNAME:
       from_secret: smtp_username
-    SMTP_PASSWORD:
+    PLUGIN_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
   resources:
     limits:
-      cpu: 150
+      cpu: 50
-      memory: 150M
+      memory: 25M
   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
+- latest-amd64
-
+- latest-arm-v7
-steps:
+- latest-arm64-v8
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
-
-- 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.16.1
-
-- 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,55 +457,105 @@ 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.3.1
-
 - name: build
-  image: docker.io/plugins/docker:20.18.4
+  image: plugins/docker
   settings:
+    dockerfile: Dockerfile
     auto_tag: true
     auto_tag_suffix: amd64
-    dockerfile: Dockerfile
+    repo: volkerraschek/postfixadmin
-    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
+      from_secret: container_image_registry_user
     password:
-      from_secret: git_cryptic_systems_container_registry_password
+      from_secret: container_image_registry_password
     build_args:
     - POSTFIXADMIN_VERSION=${DRONE_TAG}
+    no_cache: true
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
 
-- name: email-notification
+- name: notify
+  image: drillster/drone-email
   environment:
-    SMTP_FROM_ADDRESS:
+    PLUGIN_HOST:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
       from_secret: smtp_host
-    SMTP_USERNAME:
+    PLUGIN_USERNAME:
       from_secret: smtp_username
-    SMTP_PASSWORD:
+    PLUGIN_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
   when:
     status:
     - changed
     - failure
 
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
+trigger:
+  event:
+  - tag
+  repo:
+  - volker.raschek/postfixadmin-docker
+
+---
+kind: pipeline
+type: docker
+name: tagged-arm-v7
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: build
+  image: plugins/docker
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: true
+    auto_tag_suffix: arm-v7
+    repo: volkerraschek/postfixadmin
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+    build_args:
+    - POSTFIXADMIN_VERSION=${DRONE_TAG}
+    no_cache: true
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+
+- name: notify
+  image: drillster/drone-email
+  environment:
+    PLUGIN_HOST:
+      from_secret: smtp_host
+    PLUGIN_USERNAME:
+      from_secret: smtp_username
+    PLUGIN_PASSWORD:
+      from_secret: smtp_password
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  when:
+    status:
+    - changed
+    - failure
+
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
 trigger:
   event:
   - tag
@@ -497,55 +567,50 @@ 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.3.1
-
 - name: build
-  image: docker.io/plugins/docker:20.18.4
+  image: plugins/docker
   settings:
+    dockerfile: Dockerfile
     auto_tag: true
     auto_tag_suffix: arm64-v8
-    dockerfile: Dockerfile
+    repo: volkerraschek/postfixadmin
-    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
+      from_secret: container_image_registry_user
     password:
-      from_secret: git_cryptic_systems_container_registry_password
+      from_secret: container_image_registry_password
     build_args:
     - POSTFIXADMIN_VERSION=${DRONE_TAG}
+    no_cache: true
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
 
-- name: email-notification
+- name: notify
+  image: drillster/drone-email
   environment:
-    SMTP_FROM_ADDRESS:
+    PLUGIN_HOST:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
       from_secret: smtp_host
-    SMTP_USERNAME:
+    PLUGIN_USERNAME:
       from_secret: smtp_username
-    SMTP_PASSWORD:
+    PLUGIN_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
   when:
     status:
     - changed
     - failure
 
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
 trigger:
   event:
   - tag
@@ -557,55 +622,43 @@ 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.3.1
-
 - name: build-manifest
-  image: docker.io/plugins/manifest:1.4.0
+  image: plugins/manifest
   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
+- name: notify
+  image: docker.io/drillster/drone-email:latest
   environment:
-    SMTP_FROM_ADDRESS:
+    PLUGIN_HOST:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
       from_secret: smtp_host
-    SMTP_USERNAME:
+    PLUGIN_USERNAME:
       from_secret: smtp_username
-    SMTP_PASSWORD:
+    PLUGIN_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
   resources:
     limits:
-      cpu: 150
+      cpu: 50
-      memory: 150M
+      memory: 25M
   when:
     status:
     - changed
     - failure
 
+depends_on:
+- tagged-amd64
+- tagged-arm-v7
+- tagged-arm64-v8
+
 trigger:
   event:
   - tag
@@ -615,56 +668,54 @@ trigger:
 ---
 kind: pipeline
 type: kubernetes
-name: tagged-sync
+name: sync
 
-clone:
+platform:
-  disable: true
+  os: linux
-
+  arch: amd64
-depends_on:
-- tagged-manifest
 
 steps:
-- name: clone
+- name: github
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: docker.io/appleboy/drone-git-push:latest
-
+  resources:
-- name: tagged-sync
+    limits:
-  commands:
+      cpu: 50
-  - 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
+      memory: 25M
-  environment:
+  settings:
-    SRC_CRED_USERNAME:
+    branch: master
-      from_secret: git_cryptic_systems_container_registry_user
+    remote: ssh://git@github.com/volker-raschek/postfixadmin-docker.git
-    SRC_CRED_PASSWORD:
+    force: true
-      from_secret: git_cryptic_systems_container_registry_password
+    ssh_key:
-    DEST_CRED_USERNAME:
+      from_secret: ssh_key
-      from_secret: container_image_registry_user
-    DEST_CRED_PASSWORD:
-      from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.16.1
 
 - name: email-notification
   environment:
-    SMTP_FROM_ADDRESS:
+    PLUGIN_HOST:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
       from_secret: smtp_host
-    SMTP_USERNAME:
+    PLUGIN_USERNAME:
       from_secret: smtp_username
-    SMTP_PASSWORD:
+    PLUGIN_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  image: docker.io/drillster/drone-email:latest
   resources:
     limits:
-      cpu: 150
+      cpu: 50
-      memory: 150M
+      memory: 25M
   when:
     status:
     - changed
     - failure
 
+depends_on:
+- latest-manifest
+
 trigger:
+  branch:
+  - master
   event:
-  - tag
+  - cron
+  - push
   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,7 +1,7 @@
 FROM docker.io/library/php:7.4-apache
 
 # POSTFIXADMIN VERSION
-ARG POSTFIXADMIN_VERSION
+ARG POSTFIXADMIN_VERSION=3.3.9
 
 # APACHE
 ENV APACHE_DOCUMENT_ROOT /var/www/html/public

Makefile

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

manifest.tmpl

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

renovate.json

@@ -1,45 +1,22 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "assignees": [ "volker.raschek" ],
-  "labels": [ "renovate" ],
-  "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" ]
-    },
-    {
-      "description": "Trim leading postfixadmin- from git tag",
-      "addLabels": [ "renovate/postfixadmin" ],
   "automerge": false,
-      "extractVersion": "^postfixadmin-(?<version>\\d+\\.\\d+\\.\\d+)$",
+  "automergeStrategy": "merge-commit",
-      "matchPackageNames": [ "postfixadmin/postfixadmin" ],
+  "automergeType": "pr",
-      "matchManagers": [ "regex" ]
-    }
-  ],
   "rebaseLabel": "renovate/rebase",
   "rebaseWhen": "behind-base-branch",
   "regexManagers": [
     {
       "description": "Update postfixadmin git tag",
       "fileMatch": [
-        "^Makefile$"
+        "^Dockerfile$"
       ],
       "matchStrings": [
-        "POSTFIXADMIN_VERSION\\?=(?<currentValue>.*?)\n"
+        "ARG POSTFIXADMIN_VERSION=(?<currentValue>.*?)\n"
       ],
-      "datasourceTemplate": "github-tags",
       "depNameTemplate": "postfixadmin/postfixadmin",
-      "versioningTemplate": "regex:^(postfixadmin-)?(v)?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(\\s*)?$"
+      "datasourceTemplate": "github-tags",
+      "versioningTemplate": "regex:^(postfixadmin-)?(v)?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\s"
     }
   ]
 }