Skip to content

Commit

Permalink
USH-1331: upgrade to php 7.4 and composer dependencies update
Browse files Browse the repository at this point in the history
  • Loading branch information
tuxpiper committed Jun 5, 2024
1 parent 9f53d33 commit eb6be8c
Show file tree
Hide file tree
Showing 4 changed files with 1,490 additions and 1,006 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-and-ship.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
php_version:
- 7.3
- 7.4

steps:
- uses: actions/checkout@v3
Expand Down
11 changes: 6 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
FROM ushahidi/php-fpm-nginx:php-7.3
FROM ushahidi/php-fpm-nginx:php-7.4
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_MAJOR_VERSION}-dev
RUN pecl channel-update pecl.php.net
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_MAJOR_VERSION}/fpm
RUN docker-php-ext-enable xdebug
ENV PHP_INI_DIR=/etc/php/7.3/cli
ENV PHP_INI_DIR=/etc/php/${PHP_MAJOR_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_MAJOR_VERSION}/fpm/conf.d

WORKDIR /var/www
COPY composer.json ./
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"php": ">=7.3 <=7.4",
"php": ">=7.4 <8",
"asm89/stack-cors": "^2.1",
"doctrine/cache": "^1.6.2",
"doctrine/dbal": "^2.0",
Expand Down Expand Up @@ -53,7 +53,6 @@
"dms/phpunit-arraysubset-asserts": "^0.4.0",
"facade/ignition": "~2.5",
"fakerphp/faker": "^1.9.1",
"heroku/heroku-buildpack-php": "dev-master",
"laravel/homestead": "^11.0",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^5.10",
Expand Down
Loading

0 comments on commit eb6be8c

Please sign in to comment.