fix: database port

.drone.yml

@@ -11,7 +11,7 @@ steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.28.1
+  image: docker.io/volkerraschek/markdownlint:0.29.0
   resources:
     limits:
       cpu: 50
@@ -41,6 +41,7 @@ trigger:
   event:
     exclude:
     - tag
+
 ---
 kind: pipeline
 type: docker
@@ -66,9 +67,6 @@ steps:
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
-  when:
-    branch:
-    - master
 
 - name: notify
   image: drillster/drone-email
@@ -91,10 +89,17 @@ volumes:
   host:
     path: /var/run/docker.sock
 
+depends_on:
+- linter
+
 trigger:
+  branch:
+  - master
   event:
-    exclude:
-    - tag
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
 
 ---
 kind: pipeline
@@ -118,9 +123,6 @@ steps:
     password:
       from_secret: container_image_registry_password
     no_cache: true
-  when:
-    branch:
-    - master
 
 - name: notify
   image: drillster/drone-email
@@ -146,10 +148,17 @@ volumes:
   host:
     path: /var/run/docker.sock
 
+depends_on:
+- linter
+
 trigger:
+  branch:
+  - master
   event:
-    exclude:
-    - tag
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
 
 ---
 kind: pipeline
@@ -193,9 +202,13 @@ depends_on:
 - latest-armv7
 
 trigger:
+  branch:
+  - master
   event:
-    exclude:
-    - tag
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-fetchmail-docker
 
 ---
 kind: pipeline
@@ -368,7 +381,7 @@ steps:
       memory: 25M
   settings:
     branch: master
-    remote: ssh://git@github.com/volker-raschek/fetchmail-docker.git
+    remote: ssh://git@github.com/volker-raschek/postfixadmin-fetchmail-docker.git
     force: true
     ssh_key:
       from_secret: ssh_key
@@ -393,8 +406,14 @@ steps:
     - changed
     - failure
 
+depends_on:
+- latest-manifest
+
 trigger:
+  branch:
+  - master
   event:
+  - cron
   - push
   repo:
   - volker.raschek/postfixadmin-fetchmail-docker

Dockerfile

@@ -1,6 +1,7 @@
 FROM docker.io/library/alpine:3.11.2
 
 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)
-[![Docker Pulls](https://img.shields.io/docker/pulls/volkerraschek/fetchmail)](https://hub.docker.com/r/volkerraschek/fetchmail)
+[![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/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
-mails from external servers and forward them to on local running mail server.
+`docker.io/volkerraschek/postfixadmin-fetchmail`. The primary goal of the image
+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,13 @@
 version: "3"
 services:
-  fetchmail:
-    container_name: fetchmail
-    image: volkerraschek/fetchmail-docker:latest
+  postfixadmin-fetchmail:
+    container_name: postfixadmin-fetchmail
+    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

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);