Merge pull request 'chore(deps): update dependency postfixadmin/postfixadmin to v3.3.13' (#12 ) from renovate/postfixadmin-postfixadmin-3.x into master

Reviewed-on: #12
chore(deps): update dependency postfixadmin/postfixadmin to v3.3.13
2023-01-20 15:49:05 +00:00 · 2023-01-07 20:00:39 +01:00 · 2023-01-07 19:44:19 +01:00 · 2022-08-22 11:52:43 +02:00 · 2022-07-26 17:38:50 +02:00 · 2022-07-26 16:59:48 +02:00
4 changed files with 155 additions and 237 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -10,27 +10,29 @@ steps:
 - name: markdown lint
  commands:
  - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.30.0
+  image: docker.io/volkerraschek/markdownlint:0.33.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: docker.io/volkerraschek/drone-email:0.1.1
  resources:
    limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
  when:
    status:
    - changed
@ -52,7 +54,7 @@ platform:

 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
  settings:
    dockerfile: Dockerfile
    auto_tag: false
@ -64,31 +66,25 @@ steps:
    password:
      from_secret: container_image_registry_password
    no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock

- 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: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 depends_on:
 - linter

@ -113,7 +109,7 @@ platform:

 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
  settings:
    dockerfile: Dockerfile
    auto_tag: false
@ -126,30 +122,24 @@ steps:
      from_secret: container_image_registry_password
    no_cache: true

- 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
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
+  image: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 depends_on:
 - linter

@ -174,7 +164,7 @@ platform:

 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
  settings:
    dockerfile: Dockerfile
    auto_tag: false
@ -187,30 +177,24 @@ steps:
      from_secret: container_image_registry_password
    no_cache: true

- 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
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
+  image: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 depends_on:
 - linter

@ -235,7 +219,7 @@ platform:

 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
  settings:
    dockerfile: Dockerfile
    auto_tag: false
@ -246,31 +230,25 @@ steps:
    password:
      from_secret: container_image_registry_password
    no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock

- 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: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 depends_on:
 - linter

@ -294,7 +272,7 @@ platform:

 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
  settings:
    dockerfile: Dockerfile
    auto_tag: false
@ -306,30 +284,24 @@ steps:
      from_secret: container_image_registry_password
    no_cache: true

- 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
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
+  image: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 depends_on:
 - linter

@ -353,7 +325,7 @@ platform:

 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
  settings:
    dockerfile: Dockerfile
    auto_tag: false
@ -365,30 +337,24 @@ steps:
      from_secret: container_image_registry_password
    no_cache: true

- 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
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
+  image: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 depends_on:
 - linter

@ -408,7 +374,7 @@ name: latest-manifest

 steps:
 - name: build-manifest
-  image: plugins/manifest
+  image: docker.io/plugins/manifest:latest
  settings:
    auto_tag: false
    ignore_missing: true
@ -418,21 +384,23 @@ steps:
    password:
      from_secret: container_image_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: docker.io/volkerraschek/drone-email:0.1.1
  resources:
    limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
  when:
    status:
    - changed
@ -463,7 +431,7 @@ platform:

 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
  settings:
    dockerfile: Dockerfile
    auto_tag: true
@ -476,31 +444,25 @@ steps:
    build_args:
    - POSTFIXADMIN_VERSION=${DRONE_TAG}
    no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock

- 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: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 trigger:
  event:
  - tag
@ -518,7 +480,7 @@ platform:

 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
  settings:
    dockerfile: Dockerfile
    auto_tag: true
@ -531,31 +493,25 @@ steps:
    build_args:
    - POSTFIXADMIN_VERSION=${DRONE_TAG}
    no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock

- 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: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 trigger:
  event:
  - tag
@ -573,7 +529,7 @@ platform:

 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
  settings:
    dockerfile: Dockerfile
    auto_tag: true
@ -586,31 +542,25 @@ steps:
    build_args:
    - POSTFIXADMIN_VERSION=${DRONE_TAG}
    no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock

- 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: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 trigger:
  event:
  - tag
@ -624,7 +574,7 @@ name: tagged-manifest

 steps:
 - name: build-manifest
-  image: plugins/manifest
+  image: docker.io/plugins/manifest:latest
  settings:
    auto_tag: true
    ignore_missing: true
@ -634,21 +584,23 @@ steps:
    password:
      from_secret: container_image_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: docker.io/volkerraschek/drone-email:0.1.1
  resources:
    limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
  when:
    status:
    - changed
@ -664,58 +616,3 @@ trigger:
  - tag
  repo:
  - volker.raschek/postfixadmin-docker
-
---
-kind: pipeline
-type: kubernetes
-name: sync
-
-platform:
-  os: linux
-  arch: amd64
-
-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/postfixadmin-docker.git
-    force: true
-    ssh_key:
-      from_secret: ssh_key
-
- name: email-notification
-  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
-  image: docker.io/drillster/drone-email:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-depends_on:
- latest-manifest
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/postfixadmin-docker
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 FROM docker.io/library/php:7.4-apache

 # POSTFIXADMIN VERSION
-ARG POSTFIXADMIN_VERSION=3.3.9
+ARG POSTFIXADMIN_VERSION

 # APACHE
 ENV APACHE_DOCUMENT_ROOT /var/www/html/public
--- a/6
+++ b/6
@ -1,7 +1,11 @@
+# POSTFIXADMIN_VERSION
+# Only required to install a specifiy version
+POSTFIXADMIN_VERSION?=3.3.13
+
 # 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)
+CONTAINER_RUNTIME?=$(shell which podman)

 # POSTFIXADMIN_IMAGE_REGISTRY_NAME
 # Defines the name of the new container to be built using several variables.
--- a/renovate.json
+++ b/renovate.json
@ -1,22 +1,39 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "automerge": false,
+  "assignees": [ "volker.raschek" ],
  "automergeStrategy": "merge-commit",
  "automergeType": "pr",
+  "labels": [ "renovate" ],
+  "packageRules": [
+    {
+      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
+      "automerge": true,
+      "matchManagers": "droneci",
+      "matchUpdateTypes": [ "minor", "patch"]
+    },
+    {
+      "description": "Trim leading postfixadmin- from git tag",
+      "addLabels": [ "renovate/postfixadmin" ],
+      "automerge": false,
+      "extractVersion": "^postfixadmin-(?<version>\\d+\\.\\d+\\.\\d+)$",
+      "matchPackageNames": [ "postfixadmin/postfixadmin" ],
+      "matchManagers": [ "regex" ]
+    }
+  ],
  "rebaseLabel": "renovate/rebase",
  "rebaseWhen": "behind-base-branch",
  "regexManagers": [
    {
      "description": "Update postfixadmin git tag",
      "fileMatch": [
-        "^Dockerfile$"
+        "^Makefile$"
      ],
      "matchStrings": [
-        "ARG POSTFIXADMIN_VERSION=(?<currentValue>.*?)\n"
+        "POSTFIXADMIN_VERSION\\?=(?<currentValue>.*?)\n"
      ],
-      "depNameTemplate": "postfixadmin/postfixadmin",
      "datasourceTemplate": "github-tags",
-      "versioningTemplate": "regex:^(postfixadmin-)?(v)?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\s"
+      "depNameTemplate": "postfixadmin/postfixadmin",
+      "versioningTemplate": "regex:^(postfixadmin-)?(v)?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(\\s*)?$"
    }
  ]
 }
Author	SHA1	Message	Date
Markus Pesch	676e4e9dc5	Merge pull request 'chore(deps): update dependency postfixadmin/postfixadmin to v3.3.13' (#12 ) from renovate/postfixadmin-postfixadmin-3.x into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #12	2023-01-20 15:49:05 +00:00
CSRBot	663759caf5	chore(deps): update dependency postfixadmin/postfixadmin to v3.3.13 All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2023-01-07 20:00:39 +01:00
CSRBot	0955ae62ed	chore(deps): update dependency docker.io/volkerraschek/markdownlint to v0.33.0 All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2023-01-07 19:44:19 +01:00
CSRBot	6e4d59cd9f	chore(deps): update dependency docker.io/volkerraschek/markdownlint to v0.32.2 All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2022-08-22 11:52:43 +02:00
Markus Pesch	6bb3bb38de	fix(ci): remove docker socket volume All checks were successful continuous-integration/drone/push Build is passing Details	2022-07-26 17:38:50 +02:00
Markus Pesch	c5e351df7f	fix(ci): use docker.io/volkerraschek/drone-email:0.1.1 All checks were successful continuous-integration/drone/push Build is passing Details	2022-07-26 16:59:48 +02:00
CSRBot	2a3d60f01c	chore(deps): update dependency docker.io/volkerraschek/markdownlint to v0.32.1 All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2022-07-25 22:21:53 +02:00
Markus Pesch	f639dac5e2	fix: use podman instead of docker All checks were successful continuous-integration/drone/push Build is passing Details	2022-07-23 10:19:05 +02:00
CSRBot	0edab8edaf	chore(deps): update dependency docker.io/volkerraschek/markdownlint to v0.32.0 All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2022-07-18 13:32:20 +02:00
Markus Pesch	06d2da8ec4	fix(ci): resource limits All checks were successful continuous-integration/drone/push Build is passing Details	2022-05-22 13:10:21 +02:00
Markus Pesch	ceb3a08682	fix(ci): use fully qualified image name Some checks reported errors continuous-integration/drone/push Build was killed Details	2022-05-22 13:02:52 +02:00
Markus Pesch	b3e042a8dc	fix(ci): use gitea to sync repo with github All checks were successful continuous-integration/drone/push Build is passing Details	2022-05-03 17:47:41 +02:00
Markus Pesch	c170aaa085	Merge pull request 'chore(deps): update dependency postfixadmin/postfixadmin to v3.3.11' (#7 ) from renovate/postfixadmin-postfixadmin-3.x into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #7	2022-04-15 21:26:17 +00:00
CSRBot	a791674861	chore(deps): update dependency postfixadmin/postfixadmin to v3.3.11 All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2022-04-15 11:48:56 +02:00
Markus Pesch	1c6d7bbbb3	fix(ci): matchPackageNames is an array All checks were successful continuous-integration/drone/push Build is passing Details	2022-04-15 11:48:31 +02:00
Markus Pesch	278bb991bf	fix(ci): package rule to trim leading info from git version Some checks reported errors continuous-integration/drone/push Build was killed Details	2022-04-15 10:59:39 +02:00
Markus Pesch	d885a22ae4	fix(ci): extract version All checks were successful continuous-integration/drone/push Build is passing Details	2022-04-15 10:55:39 +02:00
Markus Pesch	56570f9fb8	fix(ci): renovate versionTemplate regexp All checks were successful continuous-integration/drone/push Build is passing Details	2022-04-15 10:34:07 +02:00
Markus Pesch	e29136e73a	fix(ci): renovate search condition All checks were successful continuous-integration/drone/push Build is passing Details	2022-04-14 22:04:30 +02:00
CSRBot	6edd838968	chore(deps): update docker.io/volkerraschek/markdownlint docker tag to v0.31.1 All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2022-02-09 19:32:47 +00:00
Markus Pesch	9a58c7c040	fix(ci): add package rules All checks were successful continuous-integration/drone/push Build is passing Details	2022-01-30 18:20:51 +01:00