From 09ee3ce95cac931f17b8c602dd0febe7e476d57d Mon Sep 17 00:00:00 2001 From: Michael Wyraz Date: Thu, 21 Nov 2019 11:28:58 +0100 Subject: [PATCH] Install py3-multidict from repository before installing socrate to avoid the need of gcc during build --- core/dovecot/Dockerfile | 2 +- core/nginx/Dockerfile | 2 +- core/postfix/Dockerfile | 2 +- core/rspamd/Dockerfile | 2 +- optional/postgresql/Dockerfile | 2 +- optional/unbound/Dockerfile | 2 +- webmails/rainloop/Dockerfile | 2 +- webmails/roundcube/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index 2e6a46e1..870cbe80 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -2,7 +2,7 @@ ARG DISTRO=alpine:3.10 FROM $DISTRO # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip git bash \ + python3 py3-pip git bash py3-multidict \ && pip3 install --upgrade pip # Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index 66a6e485..8189ad9f 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -2,7 +2,7 @@ ARG DISTRO=alpine:3.10 FROM $DISTRO # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip git bash \ + python3 py3-pip git bash py3-multidict \ && pip3 install --upgrade pip # Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 503558db..65a519c6 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -2,7 +2,7 @@ ARG DISTRO=alpine:3.10 FROM $DISTRO # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip git bash \ + python3 py3-pip git bash py3-multidict \ && pip3 install --upgrade pip # Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube diff --git a/core/rspamd/Dockerfile b/core/rspamd/Dockerfile index 2e4589f6..ba86e51e 100644 --- a/core/rspamd/Dockerfile +++ b/core/rspamd/Dockerfile @@ -2,7 +2,7 @@ ARG DISTRO=alpine:3.10 FROM $DISTRO # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip git bash \ + python3 py3-pip git bash py3-multidict \ && pip3 install --upgrade pip # Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube diff --git a/optional/postgresql/Dockerfile b/optional/postgresql/Dockerfile index a2317426..fbcad249 100644 --- a/optional/postgresql/Dockerfile +++ b/optional/postgresql/Dockerfile @@ -2,7 +2,7 @@ ARG DISTRO=alpine:3.10 FROM $DISTRO # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip bash \ + python3 py3-pip bash py3-multidict \ && pip3 install --upgrade pip # Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube diff --git a/optional/unbound/Dockerfile b/optional/unbound/Dockerfile index aa0abe25..71d13925 100644 --- a/optional/unbound/Dockerfile +++ b/optional/unbound/Dockerfile @@ -2,7 +2,7 @@ ARG DISTRO=alpine:3.10 FROM $DISTRO # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip git bash \ + python3 py3-pip git bash py3-multidict \ && pip3 install --upgrade pip # Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube diff --git a/webmails/rainloop/Dockerfile b/webmails/rainloop/Dockerfile index 05f8fa2d..1674da1d 100644 --- a/webmails/rainloop/Dockerfile +++ b/webmails/rainloop/Dockerfile @@ -10,7 +10,7 @@ FROM ${ARCH}php:7.3-apache as build_other FROM build_${QEMU} #Shared layer between rainloop and roundcube RUN apt-get update && apt-get install -y \ - python3 curl python3-pip git \ + python3 curl python3-pip git python3-multidict \ && rm -rf /var/lib/apt/lists \ && echo "ServerSignature Off" >> /etc/apache2/apache2.conf diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile index ad326767..5e5cfe0f 100644 --- a/webmails/roundcube/Dockerfile +++ b/webmails/roundcube/Dockerfile @@ -9,7 +9,7 @@ FROM ${ARCH}php:7.3-apache as build_other FROM build_${QEMU} #Shared layer between rainloop and roundcube RUN apt-get update && apt-get install -y \ - python3 curl python3-pip git \ + python3 curl python3-pip git python3-multidict \ && rm -rf /var/lib/apt/lists \ && echo "ServerSignature Off" >> /etc/apache2/apache2.conf