public
nobgit
read
NobMail
Based on mailcow: dockerized
Languages
Repository composition by tracked source files.
PHP
49%
JavaScript
35%
HTML
9%
CSS
4%
Shell
2%
Python
1%
Lua
0%
Perl
0%
Ruby
0%
SCSS
0%
Create file
Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git
Commit
[Alpine] Update Alpine base images to v3.13
27b18373
data/Dockerfiles/acme/Dockerfile | 7 ++++---
data/Dockerfiles/dockerapi/Dockerfile | 14 ++++++++++----
data/Dockerfiles/netfilter/Dockerfile | 24 +++++++++++++++++++-----
data/Dockerfiles/phpfpm/Dockerfile | 2 +-
data/Dockerfiles/unbound/Dockerfile | 2 +-
data/Dockerfiles/watchdog/Dockerfile | 2 +-
docker-compose.yml | 14 +++++++-------
7 files changed, 43 insertions(+), 22 deletions(-)Diff
diff --git a/data/Dockerfiles/acme/Dockerfile b/data/Dockerfiles/acme/Dockerfile
index 8369ce3d..a19c4347 100644
--- a/data/Dockerfiles/acme/Dockerfile
+++ b/data/Dockerfiles/acme/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.13
LABEL maintainer "Andre Peters <[email protected]>"
@@ -14,8 +14,9 @@ RUN apk upgrade --no-cache \
tini \
tzdata \
python3 \
- && python3 -m pip install --upgrade pip \
- && python3 -m pip install acme-tiny
+ py3-pip \
+ && pip3 install --upgrade pip \
+ && pip3 install acme-tiny
COPY acme.sh /srv/acme.sh
COPY functions.sh /srv/functions.sh
diff --git a/data/Dockerfiles/dockerapi/Dockerfile b/data/Dockerfiles/dockerapi/Dockerfile
index 16c1af59..645503a2 100644
--- a/data/Dockerfiles/dockerapi/Dockerfile
+++ b/data/Dockerfiles/dockerapi/Dockerfile
@@ -1,11 +1,17 @@
-FROM alpine:3.11
+FROM alpine:3.13
+
LABEL maintainer "Andre Peters <[email protected]>"
WORKDIR /app
-RUN apk add --update --no-cache python3 openssl tzdata \
- && pip3 install --upgrade pip \
- && pip3 install --upgrade docker flask flask-restful
+RUN apk add --update --no-cache python3 \
+ py3-pip \
+ openssl \
+ tzdata \
+&& pip3 install --upgrade pip \
+ docker \
+ flask \
+ flask-restful
COPY dockerapi.py /app/
diff --git a/data/Dockerfiles/netfilter/Dockerfile b/data/Dockerfiles/netfilter/Dockerfile
index 42aafd45..007bd641 100644
--- a/data/Dockerfiles/netfilter/Dockerfile
+++ b/data/Dockerfiles/netfilter/Dockerfile
@@ -1,15 +1,29 @@
-FROM alpine:3.11
+FROM alpine:3.13
LABEL maintainer "Andre Peters <[email protected]>"
ENV XTABLES_LIBDIR /usr/lib/xtables
ENV PYTHON_IPTABLES_XTABLES_VERSION 12
ENV IPTABLES_LIBDIR /usr/lib
-RUN apk add --virtual .build-deps gcc python3-dev libffi-dev openssl-dev \
- && apk add -U python3 iptables ip6tables tzdata musl-dev \
- && pip3 install --upgrade pip python-iptables redis ipaddress dnspython \
+RUN apk add --virtual .build-deps \
+ gcc \
+ python3-dev \
+ libffi-dev \
+ openssl-dev \
+&& apk add -U python3 \
+ iptables \
+ ip6tables \
+ tzdata \
+ py3-pip \
+ musl-dev \
+&& pip3 install --upgrade pip \
+ python-iptables \
+ redis \
+ ipaddress \
+ dnspython \
+&& apk del .build-deps
+
# && pip3 install --upgrade pip python-iptables==0.13.0 redis ipaddress dnspython \
- && apk del .build-deps
COPY server.py /
CMD ["python3", "-u", "/server.py"]
diff --git a/data/Dockerfiles/phpfpm/Dockerfile b/data/Dockerfiles/phpfpm/Dockerfile
index 7cd3e1a2..5f613b57 100644
--- a/data/Dockerfiles/phpfpm/Dockerfile
+++ b/data/Dockerfiles/phpfpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm-alpine3.11
+FROM php:7.4-fpm-alpine3.13
LABEL maintainer "Andre Peters <[email protected]>"
ENV APCU_PECL 5.1.19
diff --git a/data/Dockerfiles/unbound/Dockerfile b/data/Dockerfiles/unbound/Dockerfile
index cb34e45b..cce2c00b 100644
--- a/data/Dockerfiles/unbound/Dockerfile
+++ b/data/Dockerfiles/unbound/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.13
LABEL maintainer "Andre Peters <[email protected]>"
diff --git a/data/Dockerfiles/watchdog/Dockerfile b/data/Dockerfiles/watchdog/Dockerfile
index e82bc5d0..cbcd6f0d 100644
--- a/data/Dockerfiles/watchdog/Dockerfile
+++ b/data/Dockerfiles/watchdog/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.13
LABEL maintainer "André Peters <[email protected]>"
# Installation
diff --git a/docker-compose.yml b/docker-compose.yml
index 852d4be9..e928c720 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2.1'
services:
unbound-mailcow:
- image: mailcow/unbound:1.12
+ image: mailcow/unbound:1.13
environment:
- TZ=${TZ}
volumes:
@@ -101,7 +101,7 @@ services:
- rspamd
php-fpm-mailcow:
- image: mailcow/phpfpm:1.72
+ image: mailcow/phpfpm:1.73
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
depends_on:
- redis-mailcow
@@ -355,7 +355,7 @@ services:
acme-mailcow:
depends_on:
- nginx-mailcow
- image: mailcow/acme:1.76
+ image: mailcow/acme:1.77
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment:
@@ -390,7 +390,7 @@ services:
- acme
netfilter-mailcow:
- image: mailcow/netfilter:1.38
+ image: mailcow/netfilter:1.39
stop_grace_period: 30s
depends_on:
- dovecot-mailcow
@@ -413,7 +413,7 @@ services:
- /lib/modules:/lib/modules:ro
watchdog-mailcow:
- image: mailcow/watchdog:1.86
+ image: mailcow/watchdog:1.87
# Debug
#command: /watchdog.sh
dns:
@@ -476,7 +476,7 @@ services:
- watchdog
dockerapi-mailcow:
- image: mailcow/dockerapi:1.37
+ image: mailcow/dockerapi:1.38
security_opt:
- label=disable
restart: always
@@ -510,7 +510,7 @@ services:
- solr
olefy-mailcow:
- image: mailcow/olefy:1.5
+ image: mailcow/olefy:1.6
restart: always
environment:
- TZ=${TZ}