mirror of
https://github.com/devilbox/docker-php-fpm.git
synced 2025-12-11 03:21:15 +00:00
Fix PHP 5.6 and 7.0 work images
This commit is contained in:
@@ -629,7 +629,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -691,7 +691,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -729,7 +729,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -743,7 +743,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -207,6 +207,9 @@ fi \
|
|||||||
apt-get install -y --no-install-recommends --no-install-suggests \
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
mongodb-clients \
|
mongodb-clients \
|
||||||
mongo-tools; \
|
mongo-tools; \
|
||||||
|
else \
|
||||||
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
|
mongodb-clients; \
|
||||||
fi \
|
fi \
|
||||||
\
|
\
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
@@ -757,7 +760,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -207,6 +207,9 @@ fi \
|
|||||||
apt-get install -y --no-install-recommends --no-install-suggests \
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
mongodb-clients \
|
mongodb-clients \
|
||||||
mongo-tools; \
|
mongo-tools; \
|
||||||
|
else \
|
||||||
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
|
mongodb-clients; \
|
||||||
fi \
|
fi \
|
||||||
\
|
\
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
@@ -738,7 +741,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -734,7 +734,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -754,7 +754,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -755,7 +755,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -755,7 +755,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -674,7 +674,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -674,7 +674,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -658,7 +658,7 @@ else \
|
|||||||
pg_isready --version; \
|
pg_isready --version; \
|
||||||
fi \
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
@@ -830,7 +830,7 @@ software_available:
|
|||||||
# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
|
# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
|
||||||
mongo_client:
|
mongo_client:
|
||||||
check: |
|
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 \
|
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||||
mongofiles --version; \
|
mongofiles --version; \
|
||||||
fi \
|
fi \
|
||||||
@@ -872,6 +872,9 @@ software_available:
|
|||||||
apt-get install -y --no-install-recommends --no-install-suggests \
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
mongodb-clients \
|
mongodb-clients \
|
||||||
mongo-tools; \
|
mongo-tools; \
|
||||||
|
else \
|
||||||
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
|
mongodb-clients; \
|
||||||
fi \
|
fi \
|
||||||
7.0:
|
7.0:
|
||||||
pre: apt-get update
|
pre: apt-get update
|
||||||
@@ -880,6 +883,9 @@ software_available:
|
|||||||
apt-get install -y --no-install-recommends --no-install-suggests \
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
mongodb-clients \
|
mongodb-clients \
|
||||||
mongo-tools; \
|
mongo-tools; \
|
||||||
|
else \
|
||||||
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
|
mongodb-clients; \
|
||||||
fi \
|
fi \
|
||||||
all:
|
all:
|
||||||
pre: |
|
pre: |
|
||||||
|
|||||||
Reference in New Issue
Block a user