self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-11-25 22:12:28 +02:00
Code Issues Releases Activity

Merge #1851

Browse Source 
1851: Upgrade alpine r=mergify[bot] a=nextgens

## What type of PR?

bug-fix

## What does this PR do?

Upgrade all the images to alpine 3.14 and switch from libressl to openssl on the admin container to work around a bug in alpine

### Related issue(s)

## Prerequistes
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [ ] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/guide.html#changelog) entry file.


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
This commit is contained in:
bors[bot]
2021-08-04 19:42:55 +00:00
committed by GitHub
parent 6ea4e3217a 2b63280f59
commit a226392bf6
16 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/admin/Dockerfile
View File

@@ -1,8 +1,8 @@
# First stage to build assets
ARG DISTRO=alpine:3.12
ARG DISTRO=alpine:3.14
ARG ARCH=""
FROM ${ARCH}node:8 as assets
COPY --from=balenalib/rpi-alpine:3.10 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
COPY --from=balenalib/rpi-alpine:3.14 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
COPY package.json ./
RUN npm install
@@ -24,9 +24,9 @@ RUN mkdir -p /app
WORKDIR /app
COPY requirements-prod.txt requirements.txt
RUN apk add --no-cache libressl curl postgresql-libs mariadb-connector-c \
RUN apk add --no-cache openssl curl postgresql-libs mariadb-connector-c \
&& apk add --no-cache --virtual build-dep \
libressl-dev libffi-dev python3-dev build-base postgresql-dev mariadb-connector-c-dev cargo \
openssl-dev libffi-dev python3-dev build-base postgresql-dev mariadb-connector-c-dev cargo \
&& pip3 install -r requirements.txt \
&& apk del --no-cache build-dep

2
core/dovecot/Dockerfile
View File

@@ -1,4 +1,4 @@
ARG DISTRO=alpine:3.13
ARG DISTRO=alpine:3.14
FROM $DISTRO as builder
WORKDIR /tmp
RUN apk add git build-base automake autoconf libtool dovecot-dev xapian-core-dev icu-dev

2
core/nginx/Dockerfile
View File

@@ -1,4 +1,4 @@
ARG DISTRO=alpine:3.12
ARG DISTRO=alpine:3.14
FROM $DISTRO
# python3 shared with most images
RUN apk add --no-cache \

2
core/none/Dockerfile
View File

@@ -1,6 +1,6 @@
# This is an idle image to dynamically replace any component if disabled.
ARG DISTRO=alpine:3.12
ARG DISTRO=alpine:3.14
FROM $DISTRO
CMD sleep 1000000d

4
core/postfix/Dockerfile
View File

@@ -1,4 +1,4 @@
ARG DISTRO=alpine:3.12
ARG DISTRO=alpine:3.14
FROM $DISTRO
# python3 shared with most images
RUN apk add --no-cache \
@@ -12,7 +12,7 @@ RUN pip3 install socrate==0.2.0
RUN pip3 install "podop>0.2.5"
# Image specific layers under this line
RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain cyrus-sasl-login
RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-login
COPY conf /conf
COPY start.py /start.py

2
core/rspamd/Dockerfile
View File

@@ -1,4 +1,4 @@
ARG DISTRO=alpine:3.12
ARG DISTRO=alpine:3.14
FROM $DISTRO
# python3 shared with most images
RUN apk add --no-cache \

7
docs/Dockerfile
View File

@@ -1,4 +1,4 @@
ARG DISTRO=alpine:3.8
ARG DISTRO=python:3.8-alpine3.14
FROM $DISTRO
COPY requirements.txt /requirements.txt
@@ -6,9 +6,8 @@ COPY requirements.txt /requirements.txt
ARG version=master
ENV VERSION=$version
RUN apk add --no-cache nginx curl python3 \
&& pip3 install -r /requirements.txt \
&& mkdir /run/nginx
RUN apk add --no-cache nginx curl \
&& pip3 install -r /requirements.txt
COPY ./nginx.conf /etc/nginx/conf.d/default.conf
COPY . /docs

2
optional/clamav/Dockerfile
View File

@@ -1,4 +1,4 @@
ARG DISTRO=alpine:3.12
ARG DISTRO=alpine:3.14
FROM $DISTRO
# python3 shared with most images
RUN apk add --no-cache \

2
optional/fetchmail/Dockerfile
View File

@@ -1,4 +1,4 @@
ARG DISTRO=alpine:3.12
ARG DISTRO=alpine:3.14
FROM $DISTRO
# python3 shared with most images

3
optional/postgresql/Dockerfile
View File

@@ -1,9 +1,8 @@
ARG DISTRO=alpine:3.12
ARG DISTRO=alpine:3.14
FROM $DISTRO
# python3 shared with most images
RUN apk add --no-cache \
python3 py3-pip bash py3-multidict \
&& apk add --upgrade sudo \
&& pip3 install --upgrade pip
# Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube

2
optional/radicale/Dockerfile
View File

@@ -1,4 +1,4 @@
ARG DISTRO=alpine:3.12
ARG DISTRO=alpine:3.14
FROM $DISTRO
# python3 shared with most images

2
optional/unbound/Dockerfile
View File

@@ -1,4 +1,4 @@
ARG DISTRO=alpine:3.12
ARG DISTRO=alpine:3.14
FROM $DISTRO
# python3 shared with most images
RUN apk add --no-cache \

2
setup/Dockerfile
View File

@@ -1,4 +1,4 @@
ARG DISTRO=alpine:3.10
ARG DISTRO=alpine:3.14
FROM $DISTRO
RUN mkdir -p /app

1
towncrier/newsfragments/1851.feature Normal file
View File

@@ -0,0 +1 @@
Remove cyrus-sasl-plain as it's not packaged by alpine anymore. SASL-login is still available and used when relaying.

2
webmails/rainloop/Dockerfile
View File

@@ -3,7 +3,7 @@ ARG QEMU=other
# NOTE: only add file if building for arm
FROM ${ARCH}php:7.4-apache as build_arm
ONBUILD COPY --from=balenalib/rpi-alpine:3.10 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
ONBUILD COPY --from=balenalib/rpi-alpine:3.14 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
FROM ${ARCH}php:7.4-apache as build_other

2
webmails/roundcube/Dockerfile
View File

@@ -2,7 +2,7 @@
ARG ARCH=""
ARG QEMU=other
FROM ${ARCH}php:7.4-apache as build_arm
ONBUILD COPY --from=balenalib/rpi-alpine:3.10 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
ONBUILD COPY --from=balenalib/rpi-alpine:3.14 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
FROM ${ARCH}php:7.4-apache as build_other