Skip to content

Commit 3610e5f

Browse files
committed
Fix PHP 5.6 and 7.0 work images
1 parent a425b5f commit 3610e5f

File tree

14 files changed

+26
-14
lines changed

14 files changed

+26
-14
lines changed

Dockerfiles/work/Dockerfile-5.2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ else \
629629
pg_isready --version; \
630630
fi \
631631
\
632-
&& if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
632+
&& if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
633633
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
634634
mongofiles --version; \
635635
fi \

Dockerfiles/work/Dockerfile-5.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ else \
691691
pg_isready --version; \
692692
fi \
693693
\
694-
&& if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
694+
&& if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
695695
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
696696
mongofiles --version; \
697697
fi \

Dockerfiles/work/Dockerfile-5.4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ else \
729729
pg_isready --version; \
730730
fi \
731731
\
732-
&& if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
732+
&& if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
733733
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
734734
mongofiles --version; \
735735
fi \

Dockerfiles/work/Dockerfile-5.5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ else \
743743
pg_isready --version; \
744744
fi \
745745
\
746-
&& if echo '5.5' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
746+
&& if echo '5.5' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
747747
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
748748
mongofiles --version; \
749749
fi \

Dockerfiles/work/Dockerfile-5.6

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,9 @@ fi \
207207
apt-get install -y --no-install-recommends --no-install-suggests \
208208
mongodb-clients \
209209
mongo-tools; \
210+
else \
211+
apt-get install -y --no-install-recommends --no-install-suggests \
212+
mongodb-clients; \
210213
fi \
211214
\
212215
&& rm -rf /var/lib/apt/lists/* \
@@ -757,7 +760,7 @@ else \
757760
pg_isready --version; \
758761
fi \
759762
\
760-
&& if echo '5.6' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
763+
&& if echo '5.6' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
761764
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
762765
mongofiles --version; \
763766
fi \

Dockerfiles/work/Dockerfile-7.0

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,9 @@ fi \
207207
apt-get install -y --no-install-recommends --no-install-suggests \
208208
mongodb-clients \
209209
mongo-tools; \
210+
else \
211+
apt-get install -y --no-install-recommends --no-install-suggests \
212+
mongodb-clients; \
210213
fi \
211214
\
212215
&& rm -rf /var/lib/apt/lists/* \
@@ -738,7 +741,7 @@ else \
738741
pg_isready --version; \
739742
fi \
740743
\
741-
&& if echo '7.0' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
744+
&& if echo '7.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
742745
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
743746
mongofiles --version; \
744747
fi \

Dockerfiles/work/Dockerfile-7.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ else \
734734
pg_isready --version; \
735735
fi \
736736
\
737-
&& if echo '7.1' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
737+
&& if echo '7.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
738738
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
739739
mongofiles --version; \
740740
fi \

Dockerfiles/work/Dockerfile-7.2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ else \
754754
pg_isready --version; \
755755
fi \
756756
\
757-
&& if echo '7.2' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
757+
&& if echo '7.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
758758
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
759759
mongofiles --version; \
760760
fi \

Dockerfiles/work/Dockerfile-7.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ else \
755755
pg_isready --version; \
756756
fi \
757757
\
758-
&& if echo '7.3' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
758+
&& if echo '7.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
759759
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
760760
mongofiles --version; \
761761
fi \

Dockerfiles/work/Dockerfile-7.4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ else \
755755
pg_isready --version; \
756756
fi \
757757
\
758-
&& if echo '7.4' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
758+
&& if echo '7.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
759759
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
760760
mongofiles --version; \
761761
fi \

0 commit comments

Comments
 (0)