Fixed install of mongodb-org-shell and mongodb-org-tools

2025-12-10 19:11:16 +00:00 · 2022-03-18 12:19:00 +01:00
parent 456447070a
commit b352de6939
15 changed files with 211 additions and 28 deletions
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:5.2-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -103,8 +104,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mysql-client \
 		mupdf \
@@ -145,6 +144,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:5.3-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -103,8 +104,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mysql-client \
 		mupdf \
@@ -145,6 +144,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:5.4-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -102,8 +103,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mysql-client \
 		mupdf \
@@ -144,6 +143,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:5.5-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -102,8 +103,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mysql-client \
 		mupdf \
@@ -144,6 +143,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:5.6-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -103,8 +104,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mysql-client \
 		mupdf \
@@ -146,6 +145,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:7.0-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -103,8 +104,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mysql-client \
 		mupdf \
@@ -146,6 +145,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:7.1-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -103,8 +104,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mariadb-client \
 		mupdf \
@@ -145,6 +144,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:7.2-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -103,8 +104,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mariadb-client \
 		mupdf \
@@ -145,6 +144,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:7.3-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -103,8 +104,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mariadb-client \
 		mupdf \
@@ -145,6 +144,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:7.4-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -103,8 +104,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mariadb-client \
 		mupdf \
@@ -145,6 +144,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/Dockerfiles/work/Dockerfile-8.0
+++ b/Dockerfiles/work/Dockerfile-8.0
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:8.0-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -103,8 +104,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mariadb-client \
 		mupdf \
@@ -145,6 +144,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/Dockerfiles/work/Dockerfile-8.1
+++ b/Dockerfiles/work/Dockerfile-8.1
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:8.1-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -103,8 +104,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mariadb-client \
 		mupdf \
@@ -145,6 +144,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/Dockerfiles/work/Dockerfile-8.2
+++ b/Dockerfiles/work/Dockerfile-8.2
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:8.2-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -103,8 +104,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 		mariadb-client \
 		mupdf \
@@ -145,6 +144,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###
--- a/1
+++ b/1
@@ -252,6 +252,7 @@ build-work:
 		--label "org.opencontainers.image.created"="$$(date --rfc-3339=s)" \
 		--label "org.opencontainers.image.version"="$$(git rev-parse --abbrev-ref HEAD)" \
 		--label "org.opencontainers.image.revision"="$$(git rev-parse HEAD)" \
+		--build-arg ARCH=$(ARCH) \
 		$(ARGS) \
 		-t $(IMAGE):${VERSION}-work \
 		-f $(DIR)/work/Dockerfile-${VERSION} $(DIR)/work
--- a/build/ansible/DOCKERFILES/Dockerfile-work.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -2,6 +2,7 @@
 FROM devilbox/php-fpm:{{ php_version }}-prod
 MAINTAINER "cytopia" <cytopia@everythingcli.org>

+ARG ARCH

 ###
 ### Labels
@@ -118,8 +119,6 @@ RUN set -eux \
 		libyaml-dev \
 		locales \
 		make \
-		mongodb-org-shell \
-		mongodb-org-tools \
 		moreutils \
 {% if php_version in [7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] %}
 		mariadb-client \
@@ -167,6 +166,20 @@ RUN set -eux \
 	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)


+###
+### Instal Architecture Dependent software
+###
+RUN set -eux \
+	&& if [ "${ARCH}" = "linux/amd64" ]; \
+		DEBIAN_FRONTEND=noninteractive apt-get update -q \
+		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -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 \
+	&& rm -rf /var/lib/apt/lists/* \
+
+
 ###
 ### Install custom software
 ###