diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e278bda..f1aefb80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: swoole-4.6.3 + extensions: swoole-4.6.7 coverage: none - run: composer install --no-interaction --prefer-dist - run: composer cs @@ -39,7 +39,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: swoole-4.6.3 + extensions: swoole-4.6.7 coverage: none - run: composer install --no-interaction --prefer-dist - run: composer stan @@ -57,7 +57,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: swoole-4.6.3 + extensions: swoole-4.6.7 coverage: pcov ini-values: pcov.directory=module - run: composer install --no-interaction --prefer-dist @@ -83,7 +83,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: swoole-4.6.3 + extensions: swoole-4.6.7 coverage: pcov ini-values: pcov.directory=module - run: composer install --no-interaction --prefer-dist @@ -111,7 +111,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: swoole-4.6.3 + extensions: swoole-4.6.7 coverage: none - run: composer install --no-interaction --prefer-dist - run: composer test:db:mysql @@ -131,7 +131,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: swoole-4.6.3 + extensions: swoole-4.6.7 coverage: none - run: composer install --no-interaction --prefer-dist - run: composer test:db:maria @@ -151,7 +151,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: swoole-4.6.3 + extensions: swoole-4.6.7 coverage: none - run: composer install --no-interaction --prefer-dist - run: composer test:db:postgres @@ -173,7 +173,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: swoole-4.6.3, pdo_sqlsrv-5.9.0 + extensions: swoole-4.6.7, pdo_sqlsrv-5.9.0 coverage: none - run: composer install --no-interaction --prefer-dist - name: Create test database @@ -195,7 +195,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: swoole-4.6.3 + extensions: swoole-4.6.7 coverage: pcov ini-values: pcov.directory=module - run: composer install --no-interaction --prefer-dist @@ -226,7 +226,7 @@ jobs: with: php-version: ${{ matrix.php-version }} tools: composer - extensions: swoole-4.6.3 + extensions: swoole-4.6.7 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 18c174c8..26ee4ac0 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: swoole-4.6.3 + extensions: swoole-4.6.7 - if: ${{ matrix.swoole == 'yes' }} run: ./build.sh ${GITHUB_REF#refs/tags/v} - if: ${{ matrix.swoole == 'no' }} diff --git a/Dockerfile b/Dockerfile index 49bb28a2..c07adc28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,10 @@ -FROM php:8.0.2-alpine3.13 as base +FROM php:8.0.6-alpine3.13 as base ARG SHLINK_VERSION=latest ENV SHLINK_VERSION ${SHLINK_VERSION} -ENV SWOOLE_VERSION 4.6.3 +ENV SWOOLE_VERSION 4.6.7 ENV PDO_SQLSRV_VERSION 5.9.0 +ENV MS_ODBC_SQL_VERSION 17.5.2.1 ENV LC_ALL "C" WORKDIR /etc/shlink @@ -30,13 +31,13 @@ RUN \ # Install sqlsrv driver RUN if [ $(uname -m) == "x86_64" ]; then \ - wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.5.1.1-1_amd64.apk && \ - apk add --allow-untrusted msodbcsql17_17.5.1.1-1_amd64.apk && \ + wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \ + apk add --allow-untrusted msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \ apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} unixodbc-dev && \ pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} && \ docker-php-ext-enable pdo_sqlsrv && \ apk del .phpize-deps && \ - rm msodbcsql17_17.5.1.1-1_amd64.apk ; \ + rm msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk ; \ fi # Install swoole diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile index dc4930ec..8972e1ac 100644 --- a/data/infra/php.Dockerfile +++ b/data/infra/php.Dockerfile @@ -1,8 +1,9 @@ -FROM php:8.0.2-fpm-alpine3.13 +FROM php:8.0.6-fpm-alpine3.13 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.19 ENV PDO_SQLSRV_VERSION 5.9.0 +ENV MS_ODBC_SQL_VERSION 17.5.2.1 RUN apk update @@ -44,13 +45,13 @@ RUN mkdir -p /usr/src/php/ext/apcu \ && echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini # Install pcov and sqlsrv driver -RUN wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.5.1.1-1_amd64.apk && \ - apk add --allow-untrusted msodbcsql17_17.5.1.1-1_amd64.apk && \ +RUN wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \ + apk add --allow-untrusted msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \ apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \ pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} pcov && \ docker-php-ext-enable pdo_sqlsrv pcov && \ apk del .phpize-deps && \ - rm msodbcsql17_17.5.1.1-1_amd64.apk + rm msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk # Install composer COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile index 7cbfacb0..f0f2ca74 100644 --- a/data/infra/swoole.Dockerfile +++ b/data/infra/swoole.Dockerfile @@ -1,10 +1,11 @@ -FROM php:8.0.2-alpine3.13 +FROM php:8.0.6-alpine3.13 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.19 ENV PDO_SQLSRV_VERSION 5.9.0 ENV INOTIFY_VERSION 3.0.0 -ENV SWOOLE_VERSION 4.6.3 +ENV SWOOLE_VERSION 4.6.7 +ENV MS_ODBC_SQL_VERSION 17.5.2.1 RUN apk update @@ -54,13 +55,13 @@ RUN mkdir -p /usr/src/php/ext/inotify \ && rm /tmp/inotify.tar.gz # Install swoole, pcov and mssql driver -RUN wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.5.1.1-1_amd64.apk && \ - apk add --allow-untrusted msodbcsql17_17.5.1.1-1_amd64.apk && \ +RUN wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \ + apk add --allow-untrusted msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \ apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \ pecl install swoole-${SWOOLE_VERSION} pdo_sqlsrv-${PDO_SQLSRV_VERSION} pcov && \ docker-php-ext-enable swoole pdo_sqlsrv pcov && \ apk del .phpize-deps && \ - rm msodbcsql17_17.5.1.1-1_amd64.apk + rm msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk # Install composer COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer