From eb8380fa5b424b09d5ac130f6c964a714c78395b Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip@pytloun.cz>
Date: Mon, 26 Apr 2021 18:31:20 +0200
Subject: [PATCH] Fix python3 compatibility

---
 core/dovecot/start.py      | 2 +-
 core/nginx/Dockerfile      | 2 +-
 core/nginx/config.py       | 2 +-
 core/nginx/letsencrypt.py  | 2 +-
 core/nginx/start.py        | 2 +-
 core/postfix/Dockerfile    | 2 +-
 core/postfix/start.py      | 2 +-
 services/rspamd/Dockerfile | 2 +-
 services/rspamd/start.py   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/dovecot/start.py b/core/dovecot/start.py
index 8646da8..8e5bc95 100755
--- a/core/dovecot/start.py
+++ b/core/dovecot/start.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import jinja2
 import os
diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile
index 6717c5f..2eb7732 100644
--- a/core/nginx/Dockerfile
+++ b/core/nginx/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.13
 
-RUN apk add --no-cache nginx nginx-mod-mail python py-jinja2 certbot openssl
+RUN apk add --no-cache nginx nginx-mod-mail python3 py3-jinja2 certbot openssl
 # added to fix #522
 RUN apk add --no-cache py-requests-toolbelt py-pip
 RUN pip install "idna<2.7"
diff --git a/core/nginx/config.py b/core/nginx/config.py
index f4d5379..7d724bf 100755
--- a/core/nginx/config.py
+++ b/core/nginx/config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import jinja2
 import os
diff --git a/core/nginx/letsencrypt.py b/core/nginx/letsencrypt.py
index b6044ec..3fe8ea9 100755
--- a/core/nginx/letsencrypt.py
+++ b/core/nginx/letsencrypt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import os
 import time
diff --git a/core/nginx/start.py b/core/nginx/start.py
index b88be3c..4fa6f6d 100755
--- a/core/nginx/start.py
+++ b/core/nginx/start.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import os
 import subprocess
diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile
index b51c4af..988959f 100644
--- a/core/postfix/Dockerfile
+++ b/core/postfix/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.13
 
-RUN apk add --no-cache postfix postfix-sqlite postfix-pcre rsyslog python py-jinja2
+RUN apk add --no-cache postfix postfix-sqlite postfix-pcre rsyslog python3 py3-jinja2
 
 COPY conf /conf
 COPY start.py /start.py
diff --git a/core/postfix/start.py b/core/postfix/start.py
index 994c443..f6068ad 100755
--- a/core/postfix/start.py
+++ b/core/postfix/start.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import jinja2
 import os
diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile
index b094f82..a1f4ffa 100644
--- a/services/rspamd/Dockerfile
+++ b/services/rspamd/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.13
 
-RUN apk add --no-cache python py-jinja2 rspamd rspamd-controller rspamd-proxy ca-certificates
+RUN apk add --no-cache python3 py3-jinja2 rspamd rspamd-controller rspamd-proxy ca-certificates
 
 RUN mkdir /run/rspamd
 
diff --git a/services/rspamd/start.py b/services/rspamd/start.py
index 9d7d0cf..f18017d 100755
--- a/services/rspamd/start.py
+++ b/services/rspamd/start.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import jinja2
 import os