From dc152151569d798f36ed0445c330a2f507e5fdb8 Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 23 Mar 2022 00:15:08 +0100 Subject: [PATCH] Optimize images --- Dockerfiles/base/Dockerfile-5.2 | 4 ++-- Dockerfiles/base/Dockerfile-5.3 | 4 ++-- Dockerfiles/base/Dockerfile-5.4 | 4 ++-- Dockerfiles/base/Dockerfile-5.5 | 4 ++-- Dockerfiles/base/Dockerfile-5.6 | 4 ++-- Dockerfiles/base/Dockerfile-7.0 | 4 ++-- Dockerfiles/base/Dockerfile-7.1 | 4 ++-- Dockerfiles/base/Dockerfile-7.2 | 4 ++-- Dockerfiles/base/Dockerfile-7.3 | 4 ++-- Dockerfiles/base/Dockerfile-7.4 | 4 ++-- Dockerfiles/base/Dockerfile-8.0 | 4 ++-- Dockerfiles/base/Dockerfile-8.1 | 4 ++-- Dockerfiles/base/Dockerfile-8.2 | 4 ++-- Dockerfiles/mods/Dockerfile-5.2 | 12 ++++++------ Dockerfiles/mods/Dockerfile-5.3 | 12 ++++++------ Dockerfiles/mods/Dockerfile-5.4 | 12 ++++++------ Dockerfiles/mods/Dockerfile-5.5 | 12 ++++++------ Dockerfiles/mods/Dockerfile-5.6 | 12 ++++++------ Dockerfiles/mods/Dockerfile-7.0 | 12 ++++++------ Dockerfiles/mods/Dockerfile-7.1 | 12 ++++++------ Dockerfiles/mods/Dockerfile-7.2 | 12 ++++++------ Dockerfiles/mods/Dockerfile-7.3 | 12 ++++++------ Dockerfiles/mods/Dockerfile-7.4 | 12 ++++++------ Dockerfiles/mods/Dockerfile-8.0 | 12 ++++++------ Dockerfiles/mods/Dockerfile-8.1 | 12 ++++++------ Dockerfiles/mods/Dockerfile-8.2 | 12 ++++++------ Dockerfiles/prod/Dockerfile-5.2 | 2 +- Dockerfiles/prod/Dockerfile-5.3 | 2 +- Dockerfiles/prod/Dockerfile-5.4 | 2 +- Dockerfiles/prod/Dockerfile-5.5 | 2 +- Dockerfiles/prod/Dockerfile-5.6 | 2 +- Dockerfiles/prod/Dockerfile-7.0 | 2 +- Dockerfiles/prod/Dockerfile-7.1 | 2 +- Dockerfiles/prod/Dockerfile-7.2 | 2 +- Dockerfiles/prod/Dockerfile-7.3 | 2 +- Dockerfiles/prod/Dockerfile-7.4 | 2 +- Dockerfiles/prod/Dockerfile-8.0 | 2 +- Dockerfiles/prod/Dockerfile-8.1 | 2 +- Dockerfiles/prod/Dockerfile-8.2 | 2 +- Dockerfiles/work/Dockerfile-5.2 | 16 +++++++--------- Dockerfiles/work/Dockerfile-5.3 | 16 +++++++--------- Dockerfiles/work/Dockerfile-5.4 | 16 +++++++--------- Dockerfiles/work/Dockerfile-5.5 | 16 +++++++--------- Dockerfiles/work/Dockerfile-5.6 | 16 +++++++--------- Dockerfiles/work/Dockerfile-7.0 | 16 +++++++--------- Dockerfiles/work/Dockerfile-7.1 | 16 +++++++--------- Dockerfiles/work/Dockerfile-7.2 | 16 +++++++--------- Dockerfiles/work/Dockerfile-7.3 | 16 +++++++--------- Dockerfiles/work/Dockerfile-7.4 | 16 +++++++--------- Dockerfiles/work/Dockerfile-8.0 | 16 +++++++--------- Dockerfiles/work/Dockerfile-8.1 | 16 +++++++--------- Dockerfiles/work/Dockerfile-8.2 | 16 +++++++--------- build/ansible/DOCKERFILES/Dockerfile-base.j2 | 4 ++-- build/ansible/DOCKERFILES/Dockerfile-mods.j2 | 12 ++++++------ build/ansible/DOCKERFILES/Dockerfile-prod.j2 | 2 +- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 16 +++++++--------- 56 files changed, 224 insertions(+), 252 deletions(-) diff --git a/Dockerfiles/base/Dockerfile-5.2 b/Dockerfiles/base/Dockerfile-5.2 index 0496cb9..03947e5 100644 --- a/Dockerfiles/base/Dockerfile-5.2 +++ b/Dockerfiles/base/Dockerfile-5.2 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-5.3 b/Dockerfiles/base/Dockerfile-5.3 index 9ba4d1d..a7bb472 100644 --- a/Dockerfiles/base/Dockerfile-5.3 +++ b/Dockerfiles/base/Dockerfile-5.3 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-5.4 b/Dockerfiles/base/Dockerfile-5.4 index 66fc157..c7334d8 100644 --- a/Dockerfiles/base/Dockerfile-5.4 +++ b/Dockerfiles/base/Dockerfile-5.4 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-5.5 b/Dockerfiles/base/Dockerfile-5.5 index bd8d591..2cd2301 100644 --- a/Dockerfiles/base/Dockerfile-5.5 +++ b/Dockerfiles/base/Dockerfile-5.5 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-5.6 b/Dockerfiles/base/Dockerfile-5.6 index 4efd27e..4826ff0 100644 --- a/Dockerfiles/base/Dockerfile-5.6 +++ b/Dockerfiles/base/Dockerfile-5.6 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-7.0 b/Dockerfiles/base/Dockerfile-7.0 index 81bb3fe..d550dc5 100644 --- a/Dockerfiles/base/Dockerfile-7.0 +++ b/Dockerfiles/base/Dockerfile-7.0 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-7.1 b/Dockerfiles/base/Dockerfile-7.1 index 28d53cc..69ad40b 100644 --- a/Dockerfiles/base/Dockerfile-7.1 +++ b/Dockerfiles/base/Dockerfile-7.1 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-7.2 b/Dockerfiles/base/Dockerfile-7.2 index 42bdf17..220242f 100644 --- a/Dockerfiles/base/Dockerfile-7.2 +++ b/Dockerfiles/base/Dockerfile-7.2 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-7.3 b/Dockerfiles/base/Dockerfile-7.3 index 550e88d..4a83d6b 100644 --- a/Dockerfiles/base/Dockerfile-7.3 +++ b/Dockerfiles/base/Dockerfile-7.3 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-7.4 b/Dockerfiles/base/Dockerfile-7.4 index bf56ce7..eda04c1 100644 --- a/Dockerfiles/base/Dockerfile-7.4 +++ b/Dockerfiles/base/Dockerfile-7.4 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-8.0 b/Dockerfiles/base/Dockerfile-8.0 index f631dfa..ddd65b3 100644 --- a/Dockerfiles/base/Dockerfile-8.0 +++ b/Dockerfiles/base/Dockerfile-8.0 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-8.1 b/Dockerfiles/base/Dockerfile-8.1 index fe45252..7c7c649 100644 --- a/Dockerfiles/base/Dockerfile-8.1 +++ b/Dockerfiles/base/Dockerfile-8.1 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-8.2 b/Dockerfiles/base/Dockerfile-8.2 index 3d8e1d5..c9951b6 100644 --- a/Dockerfiles/base/Dockerfile-8.2 +++ b/Dockerfiles/base/Dockerfile-8.2 @@ -44,8 +44,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 15dfc8b..f42f07a 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:5.2-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ firebird-dev \ freetds-dev \ libbz2-dev \ @@ -64,7 +63,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -597,8 +597,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ libaspell15 \ libc-client2007e \ libenchant1c2a \ diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index ea72b33..6b21598 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:5.3-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ firebird-dev \ freetds-dev \ @@ -70,7 +69,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -706,8 +706,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ libaio1 \ libaspell15 \ libc-client2007e \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 2a3480e..34fa5f0 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:5.4-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ firebird-dev \ freetds-dev \ @@ -70,7 +69,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -717,8 +717,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ libaio1 \ libaspell15 \ libc-client2007e \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index d4b15e2..e63cebe 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:5.5-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ firebird-dev \ freetds-dev \ @@ -72,7 +71,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -755,8 +755,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ghostscript \ libaio1 \ libaspell15 \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 4fb45dd..52b0d72 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:5.6-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ firebird-dev \ freetds-dev \ @@ -74,7 +73,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -774,8 +774,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ghostscript \ libaio1 \ libaspell15 \ diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 1134290..d162873 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:7.0-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ fftw-dev \ firebird-dev \ @@ -91,7 +90,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -882,8 +882,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ fftw2 \ ghostscript \ gir1.2-poppler-0.18 \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 1b158b7..ca11e56 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:7.1-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ fftw-dev \ firebird-dev \ @@ -92,7 +91,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -891,8 +891,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ fftw2 \ ghostscript \ gir1.2-poppler-0.18 \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 0357f41..fb7b9db 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:7.2-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ fftw-dev \ firebird-dev \ @@ -92,7 +91,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -894,8 +894,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ fftw2 \ ghostscript \ gir1.2-poppler-0.18 \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 5d8b34b..7726af1 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:7.3-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ fftw-dev \ firebird-dev \ @@ -91,7 +90,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -884,8 +884,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ fftw2 \ ghostscript \ gir1.2-poppler-0.18 \ diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index fe9f1fb..fb5e808 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:7.4-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ fftw-dev \ firebird-dev \ @@ -91,7 +90,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -874,8 +874,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ fftw2 \ ghostscript \ gir1.2-poppler-0.18 \ diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index a78458a..64848d2 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:8.0-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ firebird-dev \ freetds-dev \ @@ -75,7 +74,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -800,8 +800,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ghostscript \ libaio1 \ libaspell15 \ diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index 0e062d6..07ff1e3 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:8.1-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ firebird-dev \ freetds-dev \ @@ -74,7 +73,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -775,8 +775,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ghostscript \ libaio1 \ libaspell15 \ diff --git a/Dockerfiles/mods/Dockerfile-8.2 b/Dockerfiles/mods/Dockerfile-8.2 index fea7a3c..0b46304 100644 --- a/Dockerfiles/mods/Dockerfile-8.2 +++ b/Dockerfiles/mods/Dockerfile-8.2 @@ -6,9 +6,8 @@ FROM devilbox/php-fpm:8.2-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ firebird-dev \ freetds-dev \ @@ -74,7 +73,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -764,8 +764,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ghostscript \ libaio1 \ libaspell15 \ diff --git a/Dockerfiles/prod/Dockerfile-5.2 b/Dockerfiles/prod/Dockerfile-5.2 index bf5a35e..93e4b36 100644 --- a/Dockerfiles/prod/Dockerfile-5.2 +++ b/Dockerfiles/prod/Dockerfile-5.2 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.2-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/prod/Dockerfile-5.3 b/Dockerfiles/prod/Dockerfile-5.3 index 5f8ec5b..7c262af 100644 --- a/Dockerfiles/prod/Dockerfile-5.3 +++ b/Dockerfiles/prod/Dockerfile-5.3 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.3-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/prod/Dockerfile-5.4 b/Dockerfiles/prod/Dockerfile-5.4 index 5624485..10c6679 100644 --- a/Dockerfiles/prod/Dockerfile-5.4 +++ b/Dockerfiles/prod/Dockerfile-5.4 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.4-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/prod/Dockerfile-5.5 b/Dockerfiles/prod/Dockerfile-5.5 index 3282129..d86934a 100644 --- a/Dockerfiles/prod/Dockerfile-5.5 +++ b/Dockerfiles/prod/Dockerfile-5.5 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.5-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/prod/Dockerfile-5.6 b/Dockerfiles/prod/Dockerfile-5.6 index 20b28b3..5b2b5ad 100644 --- a/Dockerfiles/prod/Dockerfile-5.6 +++ b/Dockerfiles/prod/Dockerfile-5.6 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.6-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/prod/Dockerfile-7.0 b/Dockerfiles/prod/Dockerfile-7.0 index 79fac4b..8b4716a 100644 --- a/Dockerfiles/prod/Dockerfile-7.0 +++ b/Dockerfiles/prod/Dockerfile-7.0 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.0-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/prod/Dockerfile-7.1 b/Dockerfiles/prod/Dockerfile-7.1 index f1d7773..fb2dfcf 100644 --- a/Dockerfiles/prod/Dockerfile-7.1 +++ b/Dockerfiles/prod/Dockerfile-7.1 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.1-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/prod/Dockerfile-7.2 b/Dockerfiles/prod/Dockerfile-7.2 index ab79e80..c5a424b 100644 --- a/Dockerfiles/prod/Dockerfile-7.2 +++ b/Dockerfiles/prod/Dockerfile-7.2 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.2-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/prod/Dockerfile-7.3 b/Dockerfiles/prod/Dockerfile-7.3 index 4526ca9..4810c35 100644 --- a/Dockerfiles/prod/Dockerfile-7.3 +++ b/Dockerfiles/prod/Dockerfile-7.3 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.3-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/prod/Dockerfile-7.4 b/Dockerfiles/prod/Dockerfile-7.4 index 684b01d..6cce14a 100644 --- a/Dockerfiles/prod/Dockerfile-7.4 +++ b/Dockerfiles/prod/Dockerfile-7.4 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.4-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/prod/Dockerfile-8.0 b/Dockerfiles/prod/Dockerfile-8.0 index 7789730..85630d0 100644 --- a/Dockerfiles/prod/Dockerfile-8.0 +++ b/Dockerfiles/prod/Dockerfile-8.0 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.0-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/prod/Dockerfile-8.1 b/Dockerfiles/prod/Dockerfile-8.1 index e1d3dbe..5213640 100644 --- a/Dockerfiles/prod/Dockerfile-8.1 +++ b/Dockerfiles/prod/Dockerfile-8.1 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.1-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/prod/Dockerfile-8.2 b/Dockerfiles/prod/Dockerfile-8.2 index e40fe2f..cea8cae 100644 --- a/Dockerfiles/prod/Dockerfile-8.2 +++ b/Dockerfiles/prod/Dockerfile-8.2 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.2-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index b200fe7..b41f90e 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -131,7 +130,6 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -144,12 +142,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index f8f35f7..cc3cd5e 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -131,7 +130,6 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -144,12 +142,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 8c319d6..d36504a 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -131,7 +130,6 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -144,12 +142,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index ab8f6c2..3d0d2a8 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -131,7 +130,6 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -144,12 +142,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 7419b5a..0962a62 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -133,7 +132,6 @@ RUN set -eux \ zlib1g-dev \ zsh \ zsh-common \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -146,12 +144,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index c8b7ade..f42eca5 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -133,7 +132,6 @@ RUN set -eux \ zlib1g-dev \ zsh \ zsh-common \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -146,12 +144,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index c3f08dd..d94f2f4 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -132,7 +131,6 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -145,12 +143,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 251dad0..f94e4a5 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -132,7 +131,6 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -145,12 +143,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 80ac388..c5d394f 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -132,7 +131,6 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -145,12 +143,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 193ea87..1b99b34 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -132,7 +131,6 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -145,12 +143,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 34c8d00..a5a09fc 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -132,7 +131,6 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -145,12 +143,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 837e7f5..a404386 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -132,7 +131,6 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -145,12 +143,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index b3c3958..e564d0a 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -64,8 +63,8 @@ RUN set -eux \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -132,7 +131,6 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -145,12 +143,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/* diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 index 8c2e44b..21acdc7 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-base.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2 @@ -60,8 +60,8 @@ RUN set -eux \ ### Upgrade (install ps) ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ dpkg-dev \ procps \ && rm -rf /var/lib/apt/lists/* diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 index e51aa38..61d5a4b 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 @@ -31,9 +31,8 @@ FROM devilbox/php-fpm:{{ php_version }}-base as builder ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ {% for build_dep in build_deps | unique | sort %} {{ build_dep }} \ {% endfor %} @@ -58,7 +57,8 @@ RUN set -eux \ patch \ pkg-config \ re2c \ - xz-utils + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -356,8 +356,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ {# Loop over enabled run-time dependencies -#} {%- set run_deps = [] -%} {%- for ext in extensions_enabled -%} diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 index 01ddec2..c04b340 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 @@ -26,7 +26,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM {{ php_version }}-prod" ### Install ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 11af15a..46029d4 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -eux \ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ apt-transport-https \ ca-certificates \ curl \ @@ -81,8 +80,8 @@ RUN set -eux \ {%- endif -%} {%- endif -%} {%- endfor -%}{{ "\n\t" }}\ - && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -158,7 +157,6 @@ RUN set -eux \ {% if php_version in [5.6, 7.0] %} zsh-common \ {% endif %} - && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ @@ -171,12 +169,12 @@ RUN set -eux \ ### #RUN set -eux \ # && if [ "${ARCH}" = "linux/amd64" ]; then \ -# DEBIAN_FRONTEND=noninteractive apt-get update -q \ -# && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ +# DEBIAN_FRONTEND=noninteractive apt-get update \ +# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ # mongodb-org-shell \ # mongodb-org-tools; \ # fi \ -# && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ +# && DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ # && rm -rf /var/lib/apt/lists/*