From 146921f6192a2950c62c98262ecb48097c974bae Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 14 Oct 2022 14:34:58 +0200 Subject: [PATCH] Move curl to base image --- core/admin/Dockerfile | 2 +- core/base/Dockerfile | 2 +- core/nginx/Dockerfile | 2 +- core/rspamd/Dockerfile | 2 +- optional/radicale/Dockerfile | 3 --- optional/unbound/Dockerfile | 3 +-- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index ca98662d..02dcd968 100644 --- a/core/admin/Dockerfile +++ b/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 \ diff --git a/core/base/Dockerfile b/core/base/Dockerfile index 52f0bd3a..ca87dd70 100644 --- a/core/base/Dockerfile +++ b/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 diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index cbb9cd7c..f271fc07 100644 --- a/core/nginx/Dockerfile +++ b/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/ diff --git a/core/rspamd/Dockerfile b/core/rspamd/Dockerfile index 2ccb5307..eca8e62b 100644 --- a/core/rspamd/Dockerfile +++ b/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/ diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile index f9fd7598..56606494 100644 --- a/optional/radicale/Dockerfile +++ b/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 diff --git a/optional/unbound/Dockerfile b/optional/unbound/Dockerfile index 343326fe..831476ab 100644 --- a/optional/unbound/Dockerfile +++ b/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 /