From dab0ebeb99ba80a84ba94e5bcbb2da6accc39a67 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 10 Dec 2022 17:29:52 +0100 Subject: [PATCH 1/3] Updated dockerimages to PHP 8.2 and added full support for this version --- .github/actions/ci-setup/action.yml | 5 +---- .github/workflows/ci.yml | 5 +---- .github/workflows/publish-release.yml | 4 ++-- Dockerfile | 2 +- data/infra/php.Dockerfile | 2 +- data/infra/roadrunner.Dockerfile | 2 +- data/infra/swoole.Dockerfile | 2 +- 7 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/actions/ci-setup/action.yml b/.github/actions/ci-setup/action.yml index 7ff7ad8a..78cbdf1c 100644 --- a/.github/actions/ci-setup/action.yml +++ b/.github/actions/ci-setup/action.yml @@ -41,10 +41,7 @@ runs: extensions: ${{ inputs.php-extensions }} coverage: pcov ini-values: pcov.directory=module - - run: echo "::set-output name=composerArgs::${{ inputs.php-version == '8.2' && '--ignore-platform-req=php+' || '' }}" - id: composer_args - shell: bash - name: Install dependencies if: ${{ inputs.install-deps == 'yes' }} - run: composer install --no-interaction --prefer-dist ${{ steps.composer_args.outputs.composerArgs }} + run: composer install --no-interaction --prefer-dist shell: bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba4c77dc..ca34c07d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,10 +51,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - - run: echo "::set-output name=composerArgs::${{ matrix.php-version == '8.2' && '--ignore-platform-req=php+' || '' }}" - id: composer_args - shell: bash - - run: composer install --no-interaction --prefer-dist ${{ steps.composer_args.outputs.composerArgs }} + - run: composer install --no-interaction --prefer-dist - run: ./vendor/bin/rr get --no-interaction --location bin/ && chmod +x bin/rr - run: composer test:api:rr diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index d9625125..792513be 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - php-version: ['8.1'] + php-version: ['8.1', '8.2'] swoole: ['yes', 'no'] steps: - uses: actions/checkout@v3 @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - php-version: ['8.1'] + php-version: ['8.1', '8.2'] swoole: ['yes', 'no'] steps: - uses: geekyeggo/delete-artifact@v1 diff --git a/Dockerfile b/Dockerfile index c498894e..b0803ec3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.9-alpine3.16 as base +FROM php:8.2.0-alpine3.17 as base ARG SHLINK_VERSION=latest ENV SHLINK_VERSION ${SHLINK_VERSION} diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile index a2066752..9ef87f1c 100644 --- a/data/infra/php.Dockerfile +++ b/data/infra/php.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.9-fpm-alpine3.16 +FROM php:8.2.0-fpm-alpine3.17 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.21 diff --git a/data/infra/roadrunner.Dockerfile b/data/infra/roadrunner.Dockerfile index 8520b92d..6c290edd 100644 --- a/data/infra/roadrunner.Dockerfile +++ b/data/infra/roadrunner.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.9-alpine3.16 +FROM php:8.2.0-alpine3.17 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.21 diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile index 294ad71b..e4435b54 100644 --- a/data/infra/swoole.Dockerfile +++ b/data/infra/swoole.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.9-alpine3.16 +FROM php:8.2.0-alpine3.17 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.21 From 38b313a25dba3b2e02bef544495d14525e2a36f9 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 10 Dec 2022 17:30:35 +0100 Subject: [PATCH 2/3] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a944d90..1cbab421 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this ### Added * [#1616](https://github.com/shlinkio/shlink/issues/1616) Added support to import orphan visits when importing short URLs from another Shlink instance. * [#1519](https://github.com/shlinkio/shlink/issues/1519) Allowing to search short URLs by default domain. +* [#1555](https://github.com/shlinkio/shlink/issues/1555) Added full support for PHP 8.2, pdating the dockr image to this version. ### Changed * [#1563](https://github.com/shlinkio/shlink/issues/1563) Moved logic to reuse command options to option classes instead of base abstract command classes. From 6589c8fce61b95d60359f11c3a1565b1b87d7ac7 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 10 Dec 2022 17:58:10 +0100 Subject: [PATCH 3/3] Downgraded docker images to latest php 8.1 --- Dockerfile | 2 +- data/infra/php.Dockerfile | 2 +- data/infra/roadrunner.Dockerfile | 2 +- data/infra/swoole.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b0803ec3..ff809b3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.0-alpine3.17 as base +FROM php:8.1.13-alpine3.17 as base ARG SHLINK_VERSION=latest ENV SHLINK_VERSION ${SHLINK_VERSION} diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile index 9ef87f1c..7bfbd24a 100644 --- a/data/infra/php.Dockerfile +++ b/data/infra/php.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.0-fpm-alpine3.17 +FROM php:8.1.13-fpm-alpine3.17 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.21 diff --git a/data/infra/roadrunner.Dockerfile b/data/infra/roadrunner.Dockerfile index 6c290edd..a1092de3 100644 --- a/data/infra/roadrunner.Dockerfile +++ b/data/infra/roadrunner.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.0-alpine3.17 +FROM php:8.1.13-alpine3.17 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.21 diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile index e4435b54..2314d834 100644 --- a/data/infra/swoole.Dockerfile +++ b/data/infra/swoole.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.0-alpine3.17 +FROM php:8.1.13-alpine3.17 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.21