USH-1331: upgrade to php 7.4

ushahidi · Jun 5, 2024 · d855a21 · d855a21
1 parent 9f53d33
commit d855a21
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/test-and-ship.yml b/.github/workflows/test-and-ship.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         php_version:
-          - 7.3
+          - 7.4
 
     steps:
     - uses: actions/checkout@v3

diff --git a/Dockerfile b/Dockerfile
@@ -1,16 +1,18 @@
-FROM ushahidi/php-fpm-nginx:php-7.3
+ARG PHP_VERSION=7.4
+
+FROM ushahidi/php-fpm-nginx:php-${PHP_VERSION}
 LABEL org.opencontainers.image.source="https://github.com/ushahidi/platform"
 
 COPY docker-php-ext-enable /usr/local/bin/
 RUN apt-get update 
-RUN apt-get install -y php-pear php7.3-dev
+RUN apt-get install -y php-pear php${PHP_VERSION}-dev
 RUN pecl channel-update pecl.php.net
 RUN pecl install xdebug-3.1.6 
-ENV PHP_INI_DIR=/etc/php/7.3/fpm
+ENV PHP_INI_DIR=/etc/php/${PHP_VERSION}/fpm
 RUN docker-php-ext-enable xdebug
-ENV PHP_INI_DIR=/etc/php/7.3/cli
+ENV PHP_INI_DIR=/etc/php/${PHP_VERSION}/cli
 RUN docker-php-ext-enable xdebug
-COPY docker-php-ext-xdebug.ini /etc/php/7.3/fpm/conf.d
+COPY docker-php-ext-xdebug.ini /etc/php/${PHP_VERSION}/fpm/conf.d
 
 WORKDIR /var/www
 COPY composer.json ./