[Alpine] Update Alpine base images to v3.13

master
andryyy 2021-02-18 08:48:12 +01:00
parent 0a3ea8ee3f
commit 27b18373cc
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
7 changed files with 43 additions and 22 deletions

View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.13
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
@ -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

View File

@ -1,11 +1,17 @@
FROM alpine:3.11
FROM alpine:3.13
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
WORKDIR /app
RUN apk add --update --no-cache python3 openssl tzdata \
RUN apk add --update --no-cache python3 \
py3-pip \
openssl \
tzdata \
&& pip3 install --upgrade pip \
&& pip3 install --upgrade docker flask flask-restful
docker \
flask \
flask-restful
COPY dockerapi.py /app/

View File

@ -1,15 +1,29 @@
FROM alpine:3.11
FROM alpine:3.13
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
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 \
# && pip3 install --upgrade pip python-iptables==0.13.0 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 \
COPY server.py /
CMD ["python3", "-u", "/server.py"]

View File

@ -1,4 +1,4 @@
FROM php:7.4-fpm-alpine3.11
FROM php:7.4-fpm-alpine3.13
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
ENV APCU_PECL 5.1.19

View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.13
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"

View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.13
LABEL maintainer "André Peters <andre.peters@servercow.de>"
# Installation

View File

@ -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}