From 22cecc3f854f030fde5ef4bdd52acba980e8cbcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andre.peters@servercow.de>
Date: Wed, 11 Jul 2018 20:01:03 +0200
Subject: [PATCH] [Postfix] Use Bionic as base image (Postfix 3.3) and replace
 python-gpgme by python-gpg [Postfix] Fix syslog-ng config version

---
 data/Dockerfiles/postfix/Dockerfile     | 4 ++--
 data/Dockerfiles/postfix/syslog-ng.conf | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/Dockerfiles/postfix/Dockerfile b/data/Dockerfiles/postfix/Dockerfile
index c818da63..93f059cf 100644
--- a/data/Dockerfiles/postfix/Dockerfile
+++ b/data/Dockerfiles/postfix/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM ubuntu:bionic
 LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -19,7 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	postfix \
 	postfix-mysql \
 	postfix-pcre \
-	python-gpgme \
+	python-gpg \
 	sasl2-bin \
 	sudo \
 	supervisor \
diff --git a/data/Dockerfiles/postfix/syslog-ng.conf b/data/Dockerfiles/postfix/syslog-ng.conf
index 2e36a1ae..ef835891 100644
--- a/data/Dockerfiles/postfix/syslog-ng.conf
+++ b/data/Dockerfiles/postfix/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.8
+@version: 3.13
 @include "scl.conf"
 options {
   chain_hostnames(off);