You've already forked Mailu
mirror of
https://github.com/Mailu/Mailu.git
synced 2025-11-23 22:04:47 +02:00
Merge #1964
1964: Alpine3.14.2 r=mergify[bot] a=nextgens Upgrade to alpine 3.14.2, retry upgrading unbound & switch back to libressl Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
# First stage to build assets
|
# First stage to build assets
|
||||||
ARG DISTRO=alpine:3.14
|
ARG DISTRO=alpine:3.14.2
|
||||||
ARG ARCH=""
|
ARG ARCH=""
|
||||||
|
|
||||||
FROM ${ARCH}node:16 as assets
|
FROM ${ARCH}node:16 as assets
|
||||||
@@ -25,9 +25,9 @@ RUN mkdir -p /app
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY requirements-prod.txt requirements.txt
|
COPY requirements-prod.txt requirements.txt
|
||||||
RUN apk add --no-cache openssl curl postgresql-libs mariadb-connector-c \
|
RUN apk add --no-cache libressl curl postgresql-libs mariadb-connector-c \
|
||||||
&& apk add --no-cache --virtual build-dep \
|
&& apk add --no-cache --virtual build-dep \
|
||||||
openssl-dev libffi-dev python3-dev build-base postgresql-dev mariadb-connector-c-dev cargo \
|
libressl-dev libffi-dev python3-dev build-base postgresql-dev mariadb-connector-c-dev cargo \
|
||||||
&& pip3 install -r requirements.txt \
|
&& pip3 install -r requirements.txt \
|
||||||
&& apk del --no-cache build-dep
|
&& apk del --no-cache build-dep
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ARG DISTRO=alpine:3.14
|
ARG DISTRO=alpine:3.14.2
|
||||||
FROM $DISTRO as builder
|
FROM $DISTRO as builder
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
RUN apk add git build-base automake autoconf libtool dovecot-dev xapian-core-dev icu-dev
|
RUN apk add git build-base automake autoconf libtool dovecot-dev xapian-core-dev icu-dev
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ARG DISTRO=alpine:3.14
|
ARG DISTRO=alpine:3.14.2
|
||||||
FROM $DISTRO
|
FROM $DISTRO
|
||||||
# python3 shared with most images
|
# python3 shared with most images
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# This is an idle image to dynamically replace any component if disabled.
|
# This is an idle image to dynamically replace any component if disabled.
|
||||||
|
|
||||||
ARG DISTRO=alpine:3.14
|
ARG DISTRO=alpine:3.14.2
|
||||||
FROM $DISTRO
|
FROM $DISTRO
|
||||||
|
|
||||||
CMD sleep 1000000d
|
CMD sleep 1000000d
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ARG DISTRO=alpine:3.14
|
ARG DISTRO=alpine:3.14.2
|
||||||
FROM $DISTRO
|
FROM $DISTRO
|
||||||
# python3 shared with most images
|
# python3 shared with most images
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ARG DISTRO=alpine:3.14
|
ARG DISTRO=alpine:3.14.2
|
||||||
FROM $DISTRO
|
FROM $DISTRO
|
||||||
# python3 shared with most images
|
# python3 shared with most images
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ARG DISTRO=alpine:3.14
|
ARG DISTRO=alpine:3.14.2
|
||||||
FROM $DISTRO
|
FROM $DISTRO
|
||||||
# python3 shared with most images
|
# python3 shared with most images
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ARG DISTRO=alpine:3.14
|
ARG DISTRO=alpine:3.14.2
|
||||||
FROM $DISTRO
|
FROM $DISTRO
|
||||||
|
|
||||||
# python3 shared with most images
|
# python3 shared with most images
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ARG DISTRO=alpine:3.14
|
ARG DISTRO=alpine:3.14.2
|
||||||
FROM $DISTRO
|
FROM $DISTRO
|
||||||
# python3 shared with most images
|
# python3 shared with most images
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ARG DISTRO=alpine:3.14
|
ARG DISTRO=alpine:3.14.2
|
||||||
FROM $DISTRO
|
FROM $DISTRO
|
||||||
|
|
||||||
# python3 shared with most images
|
# python3 shared with most images
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ARG DISTRO=alpine:3.12
|
ARG DISTRO=alpine:3.14.2
|
||||||
FROM $DISTRO
|
FROM $DISTRO
|
||||||
# python3 shared with most images
|
# python3 shared with most images
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ARG DISTRO=alpine:3.14
|
ARG DISTRO=alpine:3.14.2
|
||||||
FROM $DISTRO
|
FROM $DISTRO
|
||||||
|
|
||||||
RUN mkdir -p /app
|
RUN mkdir -p /app
|
||||||
|
|||||||
Reference in New Issue
Block a user