From 573d5fa2e214d332a9686ce7fa7e0dbf30e59c8f Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 3 Apr 2022 14:50:58 +0200 Subject: [PATCH] Added mongodb command line client --- Dockerfiles/work/Dockerfile-5.2 | 15 +----- Dockerfiles/work/Dockerfile-5.3 | 15 +----- Dockerfiles/work/Dockerfile-5.4 | 15 +----- Dockerfiles/work/Dockerfile-5.5 | 15 +----- Dockerfiles/work/Dockerfile-5.6 | 15 +----- Dockerfiles/work/Dockerfile-7.0 | 15 +----- Dockerfiles/work/Dockerfile-7.1 | 15 +----- Dockerfiles/work/Dockerfile-7.2 | 15 +----- Dockerfiles/work/Dockerfile-7.3 | 18 ++----- Dockerfiles/work/Dockerfile-7.4 | 18 ++----- Dockerfiles/work/Dockerfile-8.0 | 18 ++----- Dockerfiles/work/Dockerfile-8.1 | 18 ++----- Dockerfiles/work/Dockerfile-8.2 | 18 ++----- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 22 +++------ build/ansible/group_vars/all/work.yml | 51 +++++++++++++------- 15 files changed, 70 insertions(+), 213 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index e9498fe..b2480d3 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -98,6 +98,7 @@ RUN set -eux \ make \ moreutils \ mysql-client \ + mongodb-clients \ mupdf \ mupdf-tools \ nano \ @@ -134,20 +135,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 1d065b0..8400903 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -98,6 +98,7 @@ RUN set -eux \ make \ moreutils \ mysql-client \ + mongodb-clients \ mupdf \ mupdf-tools \ nano \ @@ -134,20 +135,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 9ff31d3..38e9c6d 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -98,6 +98,7 @@ RUN set -eux \ make \ moreutils \ mysql-client \ + mongodb-clients \ mupdf \ mupdf-tools \ nano \ @@ -134,20 +135,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index b3399e4..8fe07c6 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -98,6 +98,7 @@ RUN set -eux \ make \ moreutils \ mysql-client \ + mongodb-clients \ mupdf \ mupdf-tools \ nano \ @@ -134,20 +135,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 5dc7806..71a75a4 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -99,6 +99,7 @@ RUN set -eux \ make \ moreutils \ mysql-client \ + mongodb-clients \ mupdf \ mupdf-tools \ nano \ @@ -136,20 +137,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index c6e8c15..5118a93 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -99,6 +99,7 @@ RUN set -eux \ make \ moreutils \ mysql-client \ + mongodb-clients \ mupdf \ mupdf-tools \ nano \ @@ -136,20 +137,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index ac23f7a..761736c 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -99,6 +99,7 @@ RUN set -eux \ make \ moreutils \ mariadb-client \ + mongo-tools \ mupdf \ mupdf-tools \ nano \ @@ -135,20 +136,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index e193eaa..6199aac 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -99,6 +99,7 @@ RUN set -eux \ make \ moreutils \ mariadb-client \ + mongo-tools \ mupdf \ mupdf-tools \ nano \ @@ -135,20 +136,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index ddf1297..0ac349b 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -60,6 +60,8 @@ RUN set -eux \ && echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \ + && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \ + && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongo.list \ \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ @@ -99,6 +101,8 @@ RUN set -eux \ make \ moreutils \ mariadb-client \ + mongodb-org-tools \ + mongodb-org-shell \ mupdf \ mupdf-tools \ nano \ @@ -135,20 +139,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index a4badb1..5d12f2e 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -60,6 +60,8 @@ RUN set -eux \ && echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \ + && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \ + && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongo.list \ \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ @@ -99,6 +101,8 @@ RUN set -eux \ make \ moreutils \ mariadb-client \ + mongodb-org-tools \ + mongodb-org-shell \ mupdf \ mupdf-tools \ nano \ @@ -135,20 +139,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 81c4b4a..9a06451 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -60,6 +60,8 @@ RUN set -eux \ && echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \ + && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \ + && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongo.list \ \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ @@ -99,6 +101,8 @@ RUN set -eux \ make \ moreutils \ mariadb-client \ + mongodb-org-tools \ + mongodb-org-shell \ mupdf \ mupdf-tools \ nano \ @@ -135,20 +139,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 0dab5fc..51acfb5 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -60,6 +60,8 @@ RUN set -eux \ && echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \ + && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \ + && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongo.list \ \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ @@ -99,6 +101,8 @@ RUN set -eux \ make \ moreutils \ mariadb-client \ + mongodb-org-tools \ + mongodb-org-shell \ mupdf \ mupdf-tools \ nano \ @@ -135,20 +139,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index e436ede..7c872fe 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -60,6 +60,8 @@ RUN set -eux \ && echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \ + && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \ + && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongo.list \ \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ @@ -99,6 +101,8 @@ RUN set -eux \ make \ moreutils \ mariadb-client \ + mongodb-org-tools \ + mongodb-org-shell \ mupdf \ mupdf-tools \ nano \ @@ -135,20 +139,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index d370e80..f91584d 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -123,6 +123,14 @@ RUN set -eux \ mariadb-client \ {% else %} mysql-client \ +{% endif %} +{% if php_version in [5.2, 5.3, 5.4, 5.5, 5.6, 7.0] %} + mongodb-clients \ +{% elif php_version in [7.1, 7.2] %} + mongo-tools \ +{% else %} + mongodb-org-tools \ + mongodb-org-shell \ {% endif %} mupdf \ mupdf-tools \ @@ -163,20 +171,6 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) -### -### Instal Architecture Dependent software -### -#RUN set -eux \ -# && if [ "${ARCH}" = "linux/amd64" ]; then \ -# 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 -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ -# && rm -rf /var/lib/apt/lists/* - - ### ### Install custom software ### diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index cea0d73..1d56aec 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -7,6 +7,20 @@ # This file holds definition for all devibox/php-fpm:x.y-work images # +# PHP-5.2: Jessie +# PHP-5.3: Jessie +# PHP-5.4: Jessie +# PHP-5.5: Jessie +# PHP-5.6: Strech +# PHP-7.0: Stretch +# PHP-7.1: Buster +# PHP-7.2: Buster +# PHP-7.3: Bullseye +# PHP-7.4: Bullseye +# PHP-8.0: Bullseye +# PHP-8.1: Bullseye +# PHP-8.2: Bullseye + # ------------------------------------------------------------------------------------------------- # Global variables @@ -41,7 +55,7 @@ apt_repositories_enabled: - backports - blackfire - git - #- mongo + - mongo #- pgsql @@ -181,23 +195,26 @@ apt_repositories_available: # Get keys # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g' mongo: - 5.2: - # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g' - deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main - key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 - 5.3: - deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main - key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 - 5.4: - deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main - key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 - 5.5: - deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main - key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 + # 5.2 - 7.0: mongodb-clients / 7.1 - 7.2: mongo-tools / 7.3+: no mongo tools avail + disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2] + #5.2: + # # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g' + # deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main + # key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 + #5.3: + # deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main + # key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 + #5.4: + # deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main + # key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 + #5.5: + # deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main + # key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 + # 4.4 buster is the first one with arm64 support all: - # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.0.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g' - deb: deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main - key: 9DA31620334BD75D9DCB49F368818C72E52529D4 + # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.4.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g' + deb: deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main + key: 20691EEC35216C63CAF66CE1656408E390CFB1F5 pgsql: 5.2: deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main