mirror of
https://github.com/Mailu/Mailu.git
synced 2025-03-03 14:52:36 +02:00
Merge #1266
1266: Install py3-multidict from repository before installing socrate r=hoellen a=micw to avoid the need of gcc during build ## What type of PR? bug-fix ## What does this PR do? Install py3-multidict on Docker images where socrate is used. Otherwise the build fails on socrate >=2.5 due to missing gcc Co-authored-by: Michael Wyraz <michael@wyraz.de>
This commit is contained in:
commit
09be8c801e
@ -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 py3-yarl \
|
||||
&& pip3 install --upgrade pip
|
||||
|
||||
# Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube
|
||||
|
@ -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
|
||||
|
@ -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 py3-yarl \
|
||||
&& pip3 install --upgrade pip
|
||||
|
||||
# Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user