Move curl to base image

core/admin/Dockerfile

@@ -7,7 +7,7 @@ ARG VERSION=local
 LABEL version=$VERSION
 
 RUN set -euxo pipefail \
-  ; apk add --no-cache curl libressl mariadb-connector-c postgresql-libs
+  ; apk add --no-cache libressl mariadb-connector-c postgresql-libs
 
 COPY mailu/ ./mailu/
 RUN set -euxo pipefail \

core/base/Dockerfile

@@ -12,7 +12,7 @@ ARG MAILU_GID=1000
 RUN set -euxo pipefail \
   ; addgroup -Sg ${MAILU_GID} mailu \
   ; adduser -Sg ${MAILU_UID} -G mailu -h /app -g "mailu app" -s /bin/bash mailu \
-  ; apk add --no-cache bash ca-certificates python3 tzdata
+  ; apk add --no-cache bash ca-certificates curl python3 tzdata
 
 WORKDIR /app
 

core/nginx/Dockerfile

@@ -17,7 +17,7 @@ ARG VERSION
 LABEL version=$VERSION
 
 RUN set -euxo pipefail \
-  ; apk add --no-cache certbot curl nginx nginx-mod-mail openssl
+  ; apk add --no-cache certbot nginx nginx-mod-mail openssl
 
 COPY conf/ /conf/
 COPY --from=static /static/ /static/

core/rspamd/Dockerfile

@@ -7,7 +7,7 @@ ARG VERSION=local
 LABEL version=$VERSION
 
 RUN set -euxo pipefail \
-  ; apk add --no-cache curl rspamd rspamd-controller rspamd-fuzzy rspamd-proxy \
+  ; apk add --no-cache rspamd rspamd-controller rspamd-fuzzy rspamd-proxy \
   ; mkdir /run/rspamd
 
 COPY conf/ /conf/

optional/radicale/Dockerfile

@@ -6,9 +6,6 @@ FROM base
 ARG VERSION=local
 LABEL version=$VERSION
 
-RUN set -euxo pipefail \
-  ; apk add --no-cache curl
-
 COPY radicale.conf /
 
 RUN echo $VERSION >/version

optional/unbound/Dockerfile

@@ -7,11 +7,10 @@ ARG VERSION=local
 LABEL version=$VERSION
 
 RUN set -euxo pipefail \
-  ; apk add --no-cache bind-tools curl unbound \
+  ; apk add --no-cache bind-tools unbound \
   ; curl -so /etc/unbound/root.hints https://www.internic.net/domain/named.cache \
   ; chown root:unbound /etc/unbound \
   ; chmod 775 /etc/unbound \
-  ; apk del --no-cache curl \
   ; /usr/sbin/unbound-anchor -a /etc/unbound/trusted-key.key || true
 
 COPY unbound.conf /