php fixes

ushahidi · Sep 20, 2023 · 72dfaa6 · 72dfaa6
1 parent b324d3f
commit 72dfaa6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/php-fpm-nginx/7.3/Dockerfile b/php-fpm-nginx/7.3/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
     { curl https://packages.sury.org/php/apt.gpg | apt-key add - ; } && \
     { echo 'deb https://packages.sury.org/php/ buster main' > /etc/apt/sources.list.d/deb.sury.org.list ; } && \
     apt-get update && \
-    PHP_PKG_VERSION=$(apt-cache show php${PHP_MAJOR_VERSION} | grep -E "^Version: ${PHP_MINOR_VERSION}" | sed -E -e 's/^Version:\s*//' | sort -r | head -1) && \
+    PHP_PKG_VERSION=$(apt-cache show php${PHP_MAJOR_VERSION} | grep -E "^Version: ([[:digit:]]+:)?${PHP_MINOR_VERSION}" | sed -E -e 's/^Version:\s*//' | sort -r | head -1) && \
     apt-get install -y --no-install-recommends \
       php7.3=${PHP_PKG_VERSION} \
         php7.3-fpm php7.3-curl php7.3-json php7.3-mbstring \

diff --git a/php-fpm-nginx/7.4/Dockerfile b/php-fpm-nginx/7.4/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
     { curl https://packages.sury.org/php/apt.gpg | apt-key add - ; } && \
     { echo 'deb https://packages.sury.org/php/ buster main' > /etc/apt/sources.list.d/deb.sury.org.list ; } && \
     apt-get update && \
-    PHP_PKG_VERSION=$(apt-cache show php${PHP_MAJOR_VERSION} | grep -E "^Version: ${PHP_MINOR_VERSION}" | sed -E -e 's/^Version:\s*//' | sort -r | head -1) && \
+    PHP_PKG_VERSION=$(apt-cache show php${PHP_MAJOR_VERSION} | grep -E "^Version: ([[:digit:]]+:)?${PHP_MINOR_VERSION}" | sed -E -e 's/^Version:\s*//' | sort -r | head -1) && \
     apt-get install -y --no-install-recommends \
       php7.4=${PHP_PKG_VERSION} \
         php7.4-fpm php7.4-curl php7.4-json php7.4-mbstring \

diff --git a/php-fpm-nginx/8.0/Dockerfile b/php-fpm-nginx/8.0/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
     { curl https://packages.sury.org/php/apt.gpg | apt-key add - ; } && \
     { echo 'deb https://packages.sury.org/php/ buster main' > /etc/apt/sources.list.d/deb.sury.org.list ; } && \
     apt-get update && \
-    PHP_PKG_VERSION=$(apt-cache show php${PHP_MAJOR_VERSION} | grep -E "^Version: ${PHP_MINOR_VERSION}" | sed -E -e 's/^Version:\s*//' | sort -r | head -1) && \
+    PHP_PKG_VERSION=$(apt-cache show php${PHP_MAJOR_VERSION} | grep -E "^Version: ([[:digit:]]+:)?${PHP_MINOR_VERSION}" | sed -E -e 's/^Version:\s*//' | sort -r | head -1) && \
     apt-get install -y --no-install-recommends \
       php8.0=${PHP_PKG_VERSION} \
         php8.0-fpm php8.0-curl php8.0-mbstring \