From 3610e5f60287d5ac800794859d2c5ab28bbadedf Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Tue, 5 Apr 2022 13:17:52 +0200
Subject: [PATCH] Fix PHP 5.6 and 7.0 work images

---
 Dockerfiles/work/Dockerfile-5.2       | 2 +-
 Dockerfiles/work/Dockerfile-5.3       | 2 +-
 Dockerfiles/work/Dockerfile-5.4       | 2 +-
 Dockerfiles/work/Dockerfile-5.5       | 2 +-
 Dockerfiles/work/Dockerfile-5.6       | 5 ++++-
 Dockerfiles/work/Dockerfile-7.0       | 5 ++++-
 Dockerfiles/work/Dockerfile-7.1       | 2 +-
 Dockerfiles/work/Dockerfile-7.2       | 2 +-
 Dockerfiles/work/Dockerfile-7.3       | 2 +-
 Dockerfiles/work/Dockerfile-7.4       | 2 +-
 Dockerfiles/work/Dockerfile-8.0       | 2 +-
 Dockerfiles/work/Dockerfile-8.1       | 2 +-
 Dockerfiles/work/Dockerfile-8.2       | 2 +-
 build/ansible/group_vars/all/work.yml | 8 +++++++-
 14 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2
index ea52667..2f4eae2 100644
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -629,7 +629,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
index 63ae5c0..7040366 100644
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -691,7 +691,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
index dada502..eee2416 100644
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -729,7 +729,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
index 5414ad9..97c3358 100644
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -743,7 +743,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '5.5' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '5.5' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
index 6517d29..8ae79e5 100644
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -207,6 +207,9 @@ fi \
   apt-get install -y --no-install-recommends --no-install-suggests \
     mongodb-clients \
     mongo-tools; \
+else \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
 fi \
  \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -757,7 +760,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '5.6' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '5.6' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
index c3b7f2d..1bc83d8 100644
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -207,6 +207,9 @@ fi \
   apt-get install -y --no-install-recommends --no-install-suggests \
     mongodb-clients \
     mongo-tools; \
+else \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
 fi \
  \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -738,7 +741,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '7.0' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '7.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
index 73b03d6..539fd3a 100644
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -734,7 +734,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '7.1' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '7.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
index d8193dd..a0667b7 100644
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -754,7 +754,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '7.2' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '7.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
index 7420605..2947209 100644
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -755,7 +755,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '7.3' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '7.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4
index 5dfa209..c06b77b 100644
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -755,7 +755,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '7.4' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '7.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0
index 7e2bffe..8b059cb 100644
--- a/Dockerfiles/work/Dockerfile-8.0
+++ b/Dockerfiles/work/Dockerfile-8.0
@@ -674,7 +674,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '8.0' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '8.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1
index 98296d3..f97c558 100644
--- a/Dockerfiles/work/Dockerfile-8.1
+++ b/Dockerfiles/work/Dockerfile-8.1
@@ -674,7 +674,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '8.1' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '8.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2
index 55d8148..7046938 100644
--- a/Dockerfiles/work/Dockerfile-8.2
+++ b/Dockerfiles/work/Dockerfile-8.2
@@ -658,7 +658,7 @@ else \
   pg_isready --version; \
 fi \
  \
-	&& if echo '8.2' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+	&& if echo '8.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
   if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
     mongofiles --version; \
   fi \
diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml
index 817c500..59dcb8b 100644
--- a/build/ansible/group_vars/all/work.yml
+++ b/build/ansible/group_vars/all/work.yml
@@ -830,7 +830,7 @@ software_available:
   # 8.2: mongodb-org-(tools|shell) (amd64, arm64)
   mongo_client:
     check: |
-      if echo '{{ php_version }}' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+      if echo '{{ php_version }}' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
         if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
           mongofiles --version; \
         fi \
@@ -872,6 +872,9 @@ software_available:
           apt-get install -y --no-install-recommends --no-install-suggests \
             mongodb-clients \
             mongo-tools; \
+        else \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
         fi \
     7.0:
       pre: apt-get update
@@ -880,6 +883,9 @@ software_available:
           apt-get install -y --no-install-recommends --no-install-suggests \
             mongodb-clients \
             mongo-tools; \
+        else \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
         fi \
     all:
       pre: |