Consolidate use of apt-get update in containers

We no longer perform `apt-get upgrade`, and make indentation consistent
between different Containerfile definitions.
This commit is contained in:
Alex Palaistras 2021-03-21 00:16:51 +00:00
parent d9f675817e
commit 4309b3d093
6 changed files with 12 additions and 14 deletions

View File

@ -1,8 +1,7 @@
FROM docker.io/debian:stable-slim FROM docker.io/debian:stable-slim
ARG VERSION=2.3.4 ARG VERSION=2.3.4
RUN apt-get update -y && \ RUN apt-get update -y && apt-get install -y --no-install-recommends \
apt-get install -y --no-install-recommends \
dovecot-imapd=1:${VERSION}* dovecot-lmtpd=1:${VERSION}* dovecot-mysql=1:${VERSION}* \ dovecot-imapd=1:${VERSION}* dovecot-lmtpd=1:${VERSION}* dovecot-mysql=1:${VERSION}* \
dovecot-sieve=1:${VERSION}* dovecot-managesieved=1:${VERSION}* \ dovecot-sieve=1:${VERSION}* dovecot-managesieved=1:${VERSION}* \
gettext ca-certificates curl gettext ca-certificates curl

View File

@ -1,7 +1,7 @@
FROM docker.io/debian:stable-slim FROM docker.io/debian:stable-slim
RUN apt-get update -y && \ RUN apt-get update -y && apt-get install -y --no-install-recommends \
apt-get install -y --no-install-recommends git openssh-server ca-certificates ca-certificates git openssh-server
RUN addgroup --system --gid 10000 git RUN addgroup --system --gid 10000 git
RUN adduser --system --uid 10000 --ingroup git --shell /usr/bin/git-shell --home /home/git git RUN adduser --system --uid 10000 --ingroup git --shell /usr/bin/git-shell --home /home/git git

View File

@ -1,8 +1,7 @@
FROM docker.io/debian:stable-slim FROM docker.io/debian:stable-slim
ARG VERSION=3.4.14 ARG VERSION=3.4.14
RUN apt-get update -y && \ RUN apt-get update -y && apt-get install -y --no-install-recommends \
apt-get install -y --no-install-recommends \
postfix=${VERSION}* postfix-mysql=${VERSION}* syslog-ng-core gettext ca-certificates postfix=${VERSION}* postfix-mysql=${VERSION}* syslog-ng-core gettext ca-certificates
COPY container/config /etc/postfix COPY container/config /etc/postfix

View File

@ -1,14 +1,14 @@
FROM docker.io/debian:stable-slim FROM docker.io/debian:stable-slim
ARG VERSION=0.11.8 ARG VERSION=0.11.8
RUN apt-get update -y && apt-get upgrade -y && \ RUN apt-get update -y && apt-get install -y --no-install-recommends \
apt-get install -y --no-install-recommends curl mercurial gnupg ca-certificates apt-transport-https curl mercurial gnupg ca-certificates apt-transport-https
RUN echo "deb https://packages.prosody.im/debian stable main" > /etc/apt/sources.list.d/prosody.list && \ RUN echo "deb https://packages.prosody.im/debian stable main" > /etc/apt/sources.list.d/prosody.list && \
echo "deb-src https://packages.prosody.im/debian stable main" >> /etc/apt/sources.list.d/prosody.list && \ echo "deb-src https://packages.prosody.im/debian stable main" >> /etc/apt/sources.list.d/prosody.list && \
curl -o - https://prosody.im/files/prosody-debian-packages.key | apt-key add - && \ curl -o - https://prosody.im/files/prosody-debian-packages.key | apt-key add - && \
apt-get update -y && \ apt-get update -y && apt-get install -y --no-install-recommends \
apt-get install -y --no-install-recommends lua-dbi-mysql lua-event lua-zlib lua-sec lua-bitop prosody=${VERSION}* lua-dbi-mysql lua-event lua-zlib lua-sec lua-bitop prosody=${VERSION}*
RUN mkdir -p /usr/lib/prosody/community-modules && \ RUN mkdir -p /usr/lib/prosody/community-modules && \
hg clone https://hg.prosody.im/prosody-modules /usr/lib/prosody/community-modules hg clone https://hg.prosody.im/prosody-modules /usr/lib/prosody/community-modules

View File

@ -1,8 +1,8 @@
FROM docker.io/debian:stable-slim FROM docker.io/debian:stable-slim
ARG VERSION=3.0.6 ARG VERSION=3.0.6
RUN apt-get update -y && apt-get upgrade -y && \ RUN apt-get update -y && apt-get install -y --no-install-recommends \
apt-get install -y --no-install-recommends python3 python3-pip python3-setuptools gettext python3 python3-pip python3-setuptools gettext
RUN python3 -m pip install --upgrade pip && \ RUN python3 -m pip install --upgrade pip && \
python3 -m pip install radicale==$VERSION https://github.com/Unrud/RadicaleIMAP/archive/master.tar.gz python3 -m pip install radicale==$VERSION https://github.com/Unrud/RadicaleIMAP/archive/master.tar.gz

View File

@ -1,8 +1,8 @@
FROM docker.io/debian:stable-slim FROM docker.io/debian:stable-slim
ARG VERSION=2.7 ARG VERSION=2.7
RUN apt-get update -y && \ RUN apt-get update -y && apt-get install -y --no-install-recommends \
apt-get install -y --no-install-recommends curl gnupg ca-certificates ca-certificates curl gnupg
RUN echo "deb https://rspamd.com/apt-stable/ buster main" > /etc/apt/sources.list.d/rspamd.list && \ RUN echo "deb https://rspamd.com/apt-stable/ buster main" > /etc/apt/sources.list.d/rspamd.list && \
echo "deb-src https://rspamd.com/apt-stable/ buster main" >> /etc/apt/sources.list.d/rspamd.list && \ echo "deb-src https://rspamd.com/apt-stable/ buster main" >> /etc/apt/sources.list.d/rspamd.list && \