From dca6b7bbf57eff99d23d77c9448c8a72e48d08b7 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 23 Apr 2022 08:56:25 +0200 Subject: [PATCH] Updated docker images and dependencies --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/publish-release.yml | 2 +- .github/workflows/publish-swagger-spec.yml | 2 +- CHANGELOG.md | 1 + Dockerfile | 4 ++-- composer.json | 6 +++--- data/infra/php.Dockerfile | 3 +-- data/infra/swoole.Dockerfile | 5 ++--- 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6acf4e6..38ccb54c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: openswoole-4.9.1 + extensions: openswoole-4.11.0 coverage: none - run: composer install --no-interaction --prefer-dist - run: composer ${{ matrix.command }} @@ -45,7 +45,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: openswoole-4.9.1 + extensions: openswoole-4.11.0 coverage: pcov ini-values: pcov.directory=module - run: composer install --no-interaction --prefer-dist @@ -80,7 +80,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: openswoole-4.9.1, pdo_sqlsrv-5.10.0 + extensions: openswoole-4.11.0, pdo_sqlsrv-5.10.0 coverage: pcov ini-values: pcov.directory=module - run: composer install --no-interaction --prefer-dist @@ -115,7 +115,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: openswoole-4.9.1 + extensions: openswoole-4.11.0 coverage: pcov ini-values: pcov.directory=module - run: composer install --no-interaction --prefer-dist diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index dc9e516a..6d50221a 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -20,7 +20,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: openswoole-4.9.1 + extensions: openswoole-4.11.0 - if: ${{ matrix.swoole == 'yes' }} run: ./build.sh ${GITHUB_REF#refs/tags/v} - if: ${{ matrix.swoole == 'no' }} diff --git a/.github/workflows/publish-swagger-spec.yml b/.github/workflows/publish-swagger-spec.yml index bdbcc952..5b97ee6c 100644 --- a/.github/workflows/publish-swagger-spec.yml +++ b/.github/workflows/publish-swagger-spec.yml @@ -23,7 +23,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: openswoole-4.9.1 + extensions: openswoole-4.11.0 coverage: none - run: composer install --no-interaction --prefer-dist - run: composer swagger:inline diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b38e908..f674691c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this * [#1385](https://github.com/shlinkio/shlink/issues/1385) Prevented a big error message from being logged when using Shlink without mercure. * [#1398](https://github.com/shlinkio/shlink/issues/1398) Increased required mutation score for unit tests to 85%. * [#1419](https://github.com/shlinkio/shlink/issues/1419) Input dates are now parsed to Shlink's configured timezone or default timezone before using them for database quieries. +* [#1428](https://github.com/shlinkio/shlink/issues/1428) Updated native dependencies in docker image and base image to PHP v8.1.5. ### Deprecated * [#1340](https://github.com/shlinkio/shlink/issues/1340) Deprecated webhooks. New events will only be added to other real-time updates approaches, and webhooks will be completely removed in Shlink 4.0.0. diff --git a/Dockerfile b/Dockerfile index 1d07fd34..0b3ee781 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM php:8.1.3-alpine3.15 as base +FROM php:8.1.5-alpine3.15 as base ARG SHLINK_VERSION=latest ENV SHLINK_VERSION ${SHLINK_VERSION} -ENV OPENSWOOLE_VERSION 4.9.1 +ENV OPENSWOOLE_VERSION 4.11.0 ENV PDO_SQLSRV_VERSION 5.10.0 ENV MS_ODBC_SQL_VERSION 17.5.2.2 ENV LC_ALL "C" diff --git a/composer.json b/composer.json index ca691be5..2446aace 100644 --- a/composer.json +++ b/composer.json @@ -61,11 +61,11 @@ "symfony/string": "^6.0" }, "require-dev": { - "cebe/php-openapi": "^1.5", + "cebe/php-openapi": "^1.7", "devster/ubench": "^2.1", "dms/phpunit-arraysubset-asserts": "^0.3.0", "infection/infection": "^0.26.5", - "openswoole/ide-helper": "~4.9.1", + "openswoole/ide-helper": "~4.11.0", "phpspec/prophecy-phpunit": "^2.0", "phpstan/phpstan": "^1.2", "phpstan/phpstan-doctrine": "^1.0", @@ -139,7 +139,7 @@ "test:api": "bin/test/run-api-tests.sh", "test:api:ci": "GENERATE_COVERAGE=yes composer test:api", "infect:ci:base": "infection --threads=4 --log-verbosity=default --only-covered --only-covering-test-cases --skip-initial-tests", - "infect:ci:unit": "@infect:ci:base --coverage=build/coverage-unit --min-msi=84", + "infect:ci:unit": "@infect:ci:base --coverage=build/coverage-unit --min-msi=85", "infect:ci:db": "@infect:ci:base --coverage=build/coverage-db --min-msi=95 --configuration=infection-db.json", "infect:ci:api": "@infect:ci:base --coverage=build/coverage-api --min-msi=80 --configuration=infection-api.json", "infect:ci": "@parallel infect:ci:unit infect:ci:db infect:ci:api", diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile index 474e4253..3c01294d 100644 --- a/data/infra/php.Dockerfile +++ b/data/infra/php.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.3-fpm-alpine3.15 +FROM php:8.1.5-fpm-alpine3.15 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.21 @@ -9,7 +9,6 @@ RUN apk update # Install common php extensions RUN docker-php-ext-install pdo_mysql -RUN docker-php-ext-install iconv RUN docker-php-ext-install calendar RUN apk add --no-cache oniguruma-dev diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile index cc004dbe..b7f26c7c 100644 --- a/data/infra/swoole.Dockerfile +++ b/data/infra/swoole.Dockerfile @@ -1,9 +1,9 @@ -FROM php:8.1.3-alpine3.15 +FROM php:8.1.5-alpine3.15 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.21 ENV INOTIFY_VERSION 3.0.0 -ENV OPENSWOOLE_VERSION 4.9.1 +ENV OPENSWOOLE_VERSION 4.11.0 ENV PDO_SQLSRV_VERSION 5.10.0 ENV MS_ODBC_SQL_VERSION 17.5.2.2 @@ -11,7 +11,6 @@ RUN apk update # Install common php extensions RUN docker-php-ext-install pdo_mysql -RUN docker-php-ext-install iconv RUN docker-php-ext-install calendar RUN apk add --no-cache oniguruma-dev