fix: getHostname error in docker-compose

Reviewed-on: #6

.drone.yml

@@ -5,17 +5,16 @@ name: linter
 
 platform:
   os: linux
-  arch: amd64
 
 steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.28.1
+  image: docker.io/volkerraschek/markdownlint:0.31.1
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 50M
+      memory: 150M
 
 - name: email-notification
   environment:
@@ -30,8 +29,8 @@ steps:
   image: docker.io/drillster/drone-email:latest
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 25M
+      memory: 150M
   when:
     status:
     - changed
@@ -41,6 +40,190 @@ trigger:
   event:
     exclude:
     - tag
+
+---
+kind: pipeline
+type: docker
+name: dry-run-amd64
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: false
+    dry_run: true
+    tags: latest-amd64
+    repo: volkerraschek/postfixadmin-fetchmail
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+    no_cache: true
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+
+- name: notify
+  image: docker.io/drillster/drone-email:latest
+  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
+
+depends_on:
+- linter
+
+trigger:
+  branch:
+    exclude:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
+
+---
+kind: pipeline
+type: docker
+name: dry-run-arm-v7
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: false
+    dry_run: true
+    tags: latest-arm-v7
+    repo: volkerraschek/postfixadmin-fetchmail
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+    no_cache: true
+
+- name: notify
+  image: docker.io/drillster/drone-email:latest
+  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:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
+
+---
+kind: pipeline
+type: docker
+name: dry-run-arm64-v8
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: false
+    dry_run: true
+    tags: latest-arm64-v8
+    repo: volkerraschek/postfixadmin-fetchmail
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+    no_cache: true
+
+- name: notify
+  image: docker.io/drillster/drone-email:latest
+  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:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
+
 ---
 kind: pipeline
 type: docker
@@ -52,7 +235,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     dockerfile: Dockerfile
     auto_tag: false
@@ -66,12 +249,9 @@ steps:
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
-  when:
-    branch:
-    - master
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -91,15 +271,22 @@ volumes:
   host:
     path: /var/run/docker.sock
 
+depends_on:
+- linter
+
 trigger:
+  branch:
+  - master
   event:
-    exclude:
+  - cron
-    - tag
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
 
 ---
 kind: pipeline
 type: docker
-name: latest-armv7
+name: latest-arm-v7
 
 platform:
   os: linux
@@ -107,23 +294,20 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     dockerfile: Dockerfile
     auto_tag: false
-    tags: latest-armv7
+    tags: latest-arm-v7
     repo: volkerraschek/postfixadmin-fetchmail
     username:
       from_secret: container_image_registry_user
     password:
       from_secret: container_image_registry_password
     no_cache: true
-  when:
-    branch:
-    - master
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -146,10 +330,76 @@ volumes:
   host:
     path: /var/run/docker.sock
 
+depends_on:
+- linter
+
 trigger:
+  branch:
+  - master
   event:
-    exclude:
+  - cron
-    - tag
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
+
+---
+kind: pipeline
+type: docker
+name: latest-arm64-v8
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: false
+    tags: latest-arm64-v8
+    repo: volkerraschek/postfixadmin-fetchmail
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+    no_cache: true
+
+- name: notify
+  image: docker.io/drillster/drone-email:latest
+  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
+  event:
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
 
 ---
 kind: pipeline
@@ -158,7 +408,7 @@ name: latest-manifest
 
 steps:
 - name: build-manifest
-  image: plugins/manifest
+  image: docker.io/plugins/manifest:latest
   settings:
     auto_tag: false
     ignore_missing: true
@@ -181,8 +431,8 @@ steps:
       from_secret: smtp_mail_address
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 25M
+      memory: 150M
   when:
     status:
     - changed
@@ -190,12 +440,17 @@ steps:
 
 depends_on:
 - latest-amd64
-- latest-armv7
+- latest-arm-v7
+- latest-arm64-v8
 
 trigger:
+  branch:
+  - master
   event:
-    exclude:
+  - cron
-    - tag
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
 
 ---
 kind: pipeline
@@ -208,7 +463,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     dockerfile: Dockerfile
     auto_tag: true
@@ -224,7 +479,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -253,7 +508,7 @@ trigger:
 ---
 kind: pipeline
 type: docker
-name: tagged-armv7
+name: tagged-arm-v7
 
 platform:
   os: linux
@@ -261,11 +516,11 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     dockerfile: Dockerfile
     auto_tag: true
-    auto_tag_suffix: armv7
+    auto_tag_suffix: arm-v7
     repo: volkerraschek/postfixadmin-fetchmail
     username:
       from_secret: container_image_registry_user
@@ -277,7 +532,60 @@ steps:
     path: /var/run/docker.sock
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
+  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
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
+
+---
+kind: pipeline
+type: docker
+name: tagged-arm64-v8
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: true
+    auto_tag_suffix: arm64-v8
+    repo: volkerraschek/postfixadmin-fetchmail
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+    no_cache: true
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+
+- name: notify
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -310,7 +618,7 @@ name: tagged-manifest
 
 steps:
 - name: build-manifest
-  image: plugins/manifest
+  image: docker.io/plugins/manifest:latest
   settings:
     auto_tag: true
     ignore_missing: true
@@ -333,8 +641,8 @@ steps:
       from_secret: smtp_mail_address
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 25M
+      memory: 150M
   when:
     status:
     - changed
@@ -342,59 +650,11 @@ steps:
 
 depends_on:
 - tagged-amd64
-- tagged-armv7
+- tagged-arm-v7
+- tagged-arm64-v8
 
 trigger:
   event:
   - 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/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
-
-trigger:
-  event:
-  - push
-  repo:
-  - volker.raschek/postfixadmin-fetchmail-docker

Dockerfile

@@ -1,6 +1,7 @@
-FROM docker.io/library/alpine:3.11.2
+FROM docker.io/library/alpine:3.16.0
 
 RUN echo "http://dl-3.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories
+RUN apk upgrade
 RUN apk add --update perl perl-lockfile-simple perl-dbi perl-dbd-pg perl-dbd-mysql fetchmail
 RUN mkdir --parents /run/fetchmail
 

Makefile

@@ -9,7 +9,7 @@ FETCHMAIL_IMAGE_REGISTRY_NAME:=docker.io
 FETCHMAIL_IMAGE_REGISTRY_USER:=volkerraschek
 
 FETCHMAIL_IMAGE_NAMESPACE?=${FETCHMAIL_IMAGE_REGISTRY_USER}
-FETCHMAIL_IMAGE_NAME:=fetchmail
+FETCHMAIL_IMAGE_NAME:=postfixadmin-fetchmail
 FETCHMAIL_IMAGE_VERSION?=latest
 FETCHMAIL_IMAGE_FULLY_QUALIFIED=${FETCHMAIL_IMAGE_REGISTRY_NAME}/${FETCHMAIL_IMAGE_NAMESPACE}/${FETCHMAIL_IMAGE_NAME}:${FETCHMAIL_IMAGE_VERSION}
 FETCHMAIL_IMAGE_UNQUALIFIED=${FETCHMAIL_IMAGE_NAMESPACE}/${FETCHMAIL_IMAGE_NAME}:${FETCHMAIL_IMAGE_VERSION}

README.md

@@ -1,11 +1,12 @@
 # PostfixAdmin's fetchmail
 
-[![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/fetchmail-docker/status.svg)](https://drone.cryptic.systems/volker.raschek/fetchmail-docker)
+[![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/postfixadmin-fetchmail-docker/status.svg)](https://drone.cryptic.systems/volker.raschek/postfixadmin-fetchmail-docker)
-[![Docker Pulls](https://img.shields.io/docker/pulls/volkerraschek/fetchmail)](https://hub.docker.com/r/volkerraschek/fetchmail)
+[![Docker Pulls](https://img.shields.io/docker/pulls/volkerraschek/postfixadmin-fetchmail)](https://hub.docker.com/r/volkerraschek/postfixadmin-fetchmail)
 
 This project contains all sources to build the container image
-`docker.io/volkerraschek/fetchmail`. The primary goal of the image is to fetch
+`docker.io/volkerraschek/postfixadmin-fetchmail`. The primary goal of the image
-mails from external servers and forward them to on local running mail server.
+is to fetch mails from external servers and forward them to on local running
+mail server.
 
 The configuration file will be automatically generated based on information from
 a supported database backend of

docker-compose.yml

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

fetchmail.pl

@@ -35,7 +35,7 @@ openlog("fetchmail-all", "pid", "mail");
 
 sub log_and_die {
   my($message) = @_;
-  syslog("err", $message);
+  printf "err: %s\n", $message;
   die $message;
 }
 
@@ -90,7 +90,7 @@ my (%config);
 map{
   my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$usessl,$sslcertck,$sslcertpath,$sslfingerprint)=@$_;
 
-  syslog("info","fetch ${src_user}@${src_server} for ${mailbox}");
+  printf "info: fetch %s@%s for %s\n", ${src_user}, ${src_server}, ${mailbox};
 
   $cmd="user '${src_user}' there with password '".decode_base64($src_password)."'";
   $cmd.=" folder '${src_folder}'" if ($src_folder);
@@ -112,7 +112,8 @@ set postmaster "postmaster"
 set nobouncemail
 set no spambounce
 set properties ""
-set syslog
+set no syslog
+set logfile /dev/stdout
 
 poll ${src_server} with proto ${protocol}
   $cmd
@@ -129,6 +130,9 @@ TXT
 
   $sql="UPDATE fetchmail SET returned_text=".$dbh->quote($ret).", date=now() WHERE id=".$id;
   $dbh->do($sql);
+
+  printf "info: fetched mails of %s@%s for %s\n", ${src_user}, ${src_server}, ${mailbox};
+
 }@{$dbh->selectall_arrayref($sql)};
 
 $lockmgr->unlock($lock_file);

manifest.tmpl

@@ -13,8 +13,14 @@ manifests:
       architecture: amd64
       os: linux
   -
-    image: volkerraschek/postfixadmin-fetchmail:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-armv7
+    image: volkerraschek/postfixadmin-fetchmail:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm-v7
     platform:
       architecture: arm
       os: linux
-      variant: v7
+      variant: v7
+  -
+    image: volkerraschek/postfixadmin-fetchmail:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
+    platform:
+      architecture: arm64
+      os: linux
+      variant: v8

renovate.json

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