From fb26a8ae50f808dd2131e311b5e54c09fff9aaac Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 26 Sep 2021 10:19:26 +0200 Subject: [PATCH] Downgraded pdo_sqlsrv version for PHP 8.0 --- .github/workflows/ci.yml | 9 +++++++++ Dockerfile | 2 +- data/infra/php.Dockerfile | 2 +- data/infra/swoole.Dockerfile | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4939367..00ae8550 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -190,12 +190,21 @@ jobs: - name: Start database server run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_ms - name: Use PHP + if: ${{ matrix.php-version == '8.1' }} uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} tools: composer extensions: swoole-4.7.1, pdo_sqlsrv-5.10.0beta1 coverage: none + - name: Use PHP + if: ${{ matrix.php-version == '8.1' }} + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + tools: composer + extensions: swoole-4.7.1, pdo_sqlsrv-5.9.0 + coverage: none - if: ${{ matrix.php-version == '8.1' }} run: composer install --no-interaction --prefer-dist --ignore-platform-req=php - if: ${{ matrix.php-version != '8.1' }} diff --git a/Dockerfile b/Dockerfile index fa31a9af..aea95a86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM php:8.0.9-alpine3.14 as base ARG SHLINK_VERSION=latest ENV SHLINK_VERSION ${SHLINK_VERSION} ENV SWOOLE_VERSION 4.7.1 -ENV PDO_SQLSRV_VERSION 5.10.0beta1 +ENV PDO_SQLSRV_VERSION 5.9.0 ENV MS_ODBC_SQL_VERSION 17.5.2.2 ENV LC_ALL "C" diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile index ef50db50..1503ddf2 100644 --- a/data/infra/php.Dockerfile +++ b/data/infra/php.Dockerfile @@ -2,7 +2,7 @@ FROM php:8.0.9-fpm-alpine3.14 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.20 -ENV PDO_SQLSRV_VERSION 5.10.0beta1 +ENV PDO_SQLSRV_VERSION 5.9.0 ENV MS_ODBC_SQL_VERSION 17.5.2.2 RUN apk update diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile index 54635153..5b4fac1c 100644 --- a/data/infra/swoole.Dockerfile +++ b/data/infra/swoole.Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.20 ENV INOTIFY_VERSION 3.0.0 ENV SWOOLE_VERSION 4.7.1 -ENV PDO_SQLSRV_VERSION 5.10.0beta1 +ENV PDO_SQLSRV_VERSION 5.9.0 ENV MS_ODBC_SQL_VERSION 17.5.2.2 RUN apk update