Merge pull request 'chore(deps): update dependency docker.io/library/alpine to v3.17.1' (#14) from renovate/docker.io-library-alpine-3.x into master

Reviewed-on: #14

.drone.yml

@@ -10,27 +10,29 @@ steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.29.0
+  image: docker.io/volkerraschek/markdownlint:0.33.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: docker.io/volkerraschek/drone-email:0.1.1
-      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
@@ -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
+- name: email-notification
-  image: drillster/drone-email
   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: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
   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
+- name: email-notification
-  image: drillster/drone-email
   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: docker.io/volkerraschek/drone-email:0.1.1
-      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
 
@@ -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
+- name: email-notification
-  image: drillster/drone-email
   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: docker.io/volkerraschek/drone-email:0.1.1
-      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
 
@@ -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
+- name: email-notification
-  image: drillster/drone-email
   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: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
   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
+- name: email-notification
-  image: drillster/drone-email
   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: docker.io/volkerraschek/drone-email:0.1.1
-      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
 
@@ -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
+- name: email-notification
-  image: drillster/drone-email
   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: docker.io/volkerraschek/drone-email:0.1.1
-      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
 
@@ -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
+- name: email-notification
-  image: docker.io/drillster/drone-email:latest
   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: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 25M
+      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
@@ -474,31 +442,25 @@ steps:
     password:
       from_secret: container_image_registry_password
     no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
 
-- name: notify
+- name: email-notification
-  image: drillster/drone-email
   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: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
   when:
     status:
     - changed
     - failure
 
-volumes:
-- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 trigger:
   event:
   - tag
@@ -516,7 +478,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     dockerfile: Dockerfile
     auto_tag: true
@@ -527,31 +489,25 @@ steps:
     password:
       from_secret: container_image_registry_password
     no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
 
-- name: notify
+- name: email-notification
-  image: drillster/drone-email
   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: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
   when:
     status:
     - changed
     - failure
 
-volumes:
-- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 trigger:
   event:
   - tag
@@ -569,7 +525,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     dockerfile: Dockerfile
     auto_tag: true
@@ -580,31 +536,25 @@ steps:
     password:
       from_secret: container_image_registry_password
     no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
 
-- name: notify
+- name: email-notification
-  image: drillster/drone-email
   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: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
   when:
     status:
     - changed
     - failure
 
-volumes:
-- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 trigger:
   event:
   - tag
@@ -618,7 +568,7 @@ name: tagged-manifest
 
 steps:
 - name: build-manifest
-  image: plugins/manifest
+  image: docker.io/plugins/manifest:latest
   settings:
     auto_tag: true
     ignore_missing: true
@@ -628,21 +578,23 @@ steps:
     password:
       from_secret: container_image_registry_password
 
-- name: notify
+- name: email-notification
-  image: docker.io/drillster/drone-email:latest
   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: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 25M
+      memory: 150M
   when:
     status:
     - changed
@@ -658,58 +610,3 @@ trigger:
   - tag
   repo:
   - volker.raschek/postfixadmin-fetchmail-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-fetchmail-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-fetchmail-docker

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/alpine:3.11.2
+FROM docker.io/library/alpine:3.17.1
 
 RUN echo "http://dl-3.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories
 RUN apk upgrade

Makefile

@@ -1,7 +1,7 @@
 # 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)
 
 # FETCHMAIL_IMAGE_REGISTRY_NAME
 # Defines the name of the new container to be built using several variables.

docker-compose.yml

@@ -11,3 +11,4 @@ services:
     - DATABASE_PORT=${DATABASE_PORT}
     - DATABASE_NAME=${DATABASE_NAME}
     network_mode: host
+    privileged: true

renovate.json

@@ -1,8 +1,17 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "automerge": true,
+  "assignees": [ "volker.raschek" ],
   "automergeStrategy": "merge-commit",
   "automergeType": "pr",
+  "labels": [ "renovate" ],
+  "packageRules": [
+    {
+      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
+      "automerge": true,
+      "matchManagers": "droneci",
+      "matchUpdateTypes": [ "minor", "patch"]
+    }
+  ],
   "rebaseLabel": "renovate/rebase",
   "rebaseWhen": "behind-base-branch"
 }