OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-01-21 22:13:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated dev docker images to PHP 8

Browse Source
This commit is contained in:
Alejandro Celaya 2021-01-30 09:31:08 +01:00
parent eb268fb856
commit 4c008f1672
4 changed files with 40 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/ci.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
extensions: swoole-4.5.9 extensions: swoole-4.6.2
coverage: none coverage: none
- run: composer install --no-interaction --prefer-dist - run: composer install --no-interaction --prefer-dist
- run: composer cs - run: composer cs
@ -39,7 +39,7 @@ jobs:
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
extensions: swoole-4.5.9 extensions: swoole-4.6.2
coverage: none coverage: none
- run: composer install --no-interaction --prefer-dist - run: composer install --no-interaction --prefer-dist
- run: composer stan - run: composer stan
@ -57,7 +57,7 @@ jobs:
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
extensions: swoole-4.5.9 extensions: swoole-4.6.2
coverage: pcov coverage: pcov
ini-values: pcov.directory=module ini-values: pcov.directory=module
- run: composer install --no-interaction --prefer-dist - run: composer install --no-interaction --prefer-dist
@ -83,7 +83,7 @@ jobs:
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
extensions: swoole-4.5.9 extensions: swoole-4.6.2
coverage: pcov coverage: pcov
ini-values: pcov.directory=module ini-values: pcov.directory=module
- run: composer install --no-interaction --prefer-dist - run: composer install --no-interaction --prefer-dist
@ -111,7 +111,7 @@ jobs:
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
extensions: swoole-4.5.9 extensions: swoole-4.6.2
coverage: none coverage: none
- run: composer install --no-interaction --prefer-dist - run: composer install --no-interaction --prefer-dist
- run: composer test:db:mysql - run: composer test:db:mysql
@ -131,7 +131,7 @@ jobs:
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
extensions: swoole-4.5.9 extensions: swoole-4.6.2
coverage: none coverage: none
- run: composer install --no-interaction --prefer-dist - run: composer install --no-interaction --prefer-dist
- run: composer test:db:maria - run: composer test:db:maria
@ -151,7 +151,7 @@ jobs:
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
extensions: swoole-4.5.9 extensions: swoole-4.6.2
coverage: none coverage: none
- run: composer install --no-interaction --prefer-dist - run: composer install --no-interaction --prefer-dist
- run: composer test:db:postgres - run: composer test:db:postgres
@ -173,7 +173,7 @@ jobs:
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
extensions: swoole-4.5.9, pdo_sqlsrv-5.9.0beta2 extensions: swoole-4.6.2, pdo_sqlsrv-5.9.0
coverage: none coverage: none
- run: composer install --no-interaction --prefer-dist - run: composer install --no-interaction --prefer-dist
- name: Create test database - name: Create test database
@ -195,7 +195,7 @@ jobs:
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
extensions: swoole-4.5.9 extensions: swoole-4.6.2
coverage: pcov coverage: pcov
ini-values: pcov.directory=module ini-values: pcov.directory=module
- run: composer install --no-interaction --prefer-dist - run: composer install --no-interaction --prefer-dist
@ -225,7 +225,7 @@ jobs:
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
extensions: swoole-4.5.9 extensions: swoole-4.6.2
coverage: pcov coverage: pcov
ini-values: pcov.directory=module ini-values: pcov.directory=module
- run: composer install --no-interaction --prefer-dist - run: composer install --no-interaction --prefer-dist

2
.github/workflows/publish-release.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
with: with:
php-version: '7.4' # Publish release with lowest supported PHP version php-version: '7.4' # Publish release with lowest supported PHP version
tools: composer tools: composer
extensions: swoole-4.5.9 extensions: swoole-4.6.2
- name: Generate release assets - name: Generate release assets
run: ./build.sh ${GITHUB_REF#refs/tags/v} run: ./build.sh ${GITHUB_REF#refs/tags/v}
- name: Publish release with assets - name: Publish release with assets

36
data/infra/php.Dockerfile
View File

@ -1,8 +1,8 @@
FROM php:7.4.11-fpm-alpine3.12 FROM php:8.0.1-fpm-alpine3.13
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com> MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV APCU_VERSION 5.1.18 ENV APCU_VERSION 5.1.19
ENV APCU_BC_VERSION 1.0.5 ENV PDO_SQLSRV_VERSION 5.9.0
RUN apk update RUN apk update
@ -35,33 +35,19 @@ RUN docker-php-ext-install gmp
# Install APCu extension # Install APCu extension
ADD https://pecl.php.net/get/apcu-$APCU_VERSION.tgz /tmp/apcu.tar.gz ADD https://pecl.php.net/get/apcu-$APCU_VERSION.tgz /tmp/apcu.tar.gz
RUN mkdir -p /usr/src/php/ext/apcu\ RUN mkdir -p /usr/src/php/ext/apcu \
&& tar xf /tmp/apcu.tar.gz -C /usr/src/php/ext/apcu --strip-components=1 && tar xf /tmp/apcu.tar.gz -C /usr/src/php/ext/apcu --strip-components=1 \
# configure and install && docker-php-ext-configure apcu \
RUN docker-php-ext-configure apcu\ && docker-php-ext-install apcu \
&& docker-php-ext-install apcu && rm /tmp/apcu.tar.gz \
# cleanup && rm /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini \
RUN rm /tmp/apcu.tar.gz && echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini
# Install APCu-BC extension
ADD https://pecl.php.net/get/apcu_bc-$APCU_BC_VERSION.tgz /tmp/apcu_bc.tar.gz
RUN mkdir -p /usr/src/php/ext/apcu-bc\
&& tar xf /tmp/apcu_bc.tar.gz -C /usr/src/php/ext/apcu-bc --strip-components=1
# configure and install
RUN docker-php-ext-configure apcu-bc\
&& docker-php-ext-install apcu-bc
# cleanup
RUN rm /tmp/apcu_bc.tar.gz
# Load APCU.ini before APC.ini
RUN rm /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
RUN echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini
# Install pcov and sqlsrv driver # 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 && \ 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 && \ apk add --allow-untrusted msodbcsql17_17.5.1.1-1_amd64.apk && \
apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \ apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \
pecl install pdo_sqlsrv pcov && \ pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} pcov && \
docker-php-ext-enable pdo_sqlsrv pcov && \ docker-php-ext-enable pdo_sqlsrv pcov && \
apk del .phpize-deps && \ apk del .phpize-deps && \
rm msodbcsql17_17.5.1.1-1_amd64.apk rm msodbcsql17_17.5.1.1-1_amd64.apk

52
data/infra/swoole.Dockerfile
View File

@ -1,10 +1,10 @@
FROM php:7.4.11-alpine3.12 FROM php:8.0.1-alpine3.13
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com> MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV APCU_VERSION 5.1.18 ENV APCU_VERSION 5.1.19
ENV APCU_BC_VERSION 1.0.5 ENV PDO_SQLSRV_VERSION 5.9.0
ENV INOTIFY_VERSION 2.0.0 ENV INOTIFY_VERSION 3.0.0
ENV SWOOLE_VERSION 4.5.9 ENV SWOOLE_VERSION 4.6.2
RUN apk update RUN apk update
@ -37,43 +37,27 @@ RUN docker-php-ext-install gmp
# Install APCu extension # Install APCu extension
ADD https://pecl.php.net/get/apcu-$APCU_VERSION.tgz /tmp/apcu.tar.gz ADD https://pecl.php.net/get/apcu-$APCU_VERSION.tgz /tmp/apcu.tar.gz
RUN mkdir -p /usr/src/php/ext/apcu\ RUN mkdir -p /usr/src/php/ext/apcu \
&& tar xf /tmp/apcu.tar.gz -C /usr/src/php/ext/apcu --strip-components=1 && tar xf /tmp/apcu.tar.gz -C /usr/src/php/ext/apcu --strip-components=1 \
# configure and install && docker-php-ext-configure apcu \
RUN docker-php-ext-configure apcu\ && docker-php-ext-install apcu \
&& docker-php-ext-install apcu && rm /tmp/apcu.tar.gz \
# cleanup && rm /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini \
RUN rm /tmp/apcu.tar.gz && echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini
# Install APCu-BC extension
ADD https://pecl.php.net/get/apcu_bc-$APCU_BC_VERSION.tgz /tmp/apcu_bc.tar.gz
RUN mkdir -p /usr/src/php/ext/apcu-bc\
&& tar xf /tmp/apcu_bc.tar.gz -C /usr/src/php/ext/apcu-bc --strip-components=1
# configure and install
RUN docker-php-ext-configure apcu-bc\
&& docker-php-ext-install apcu-bc
# cleanup
RUN rm /tmp/apcu_bc.tar.gz
# Load APCU.ini before APC.ini
RUN rm /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
RUN echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini
# Install inotify extension # Install inotify extension
ADD https://pecl.php.net/get/inotify-$INOTIFY_VERSION.tgz /tmp/inotify.tar.gz ADD https://pecl.php.net/get/inotify-$INOTIFY_VERSION.tgz /tmp/inotify.tar.gz
RUN mkdir -p /usr/src/php/ext/inotify\ RUN mkdir -p /usr/src/php/ext/inotify \
&& tar xf /tmp/inotify.tar.gz -C /usr/src/php/ext/inotify --strip-components=1 && tar xf /tmp/inotify.tar.gz -C /usr/src/php/ext/inotify --strip-components=1 \
# configure and install && docker-php-ext-configure inotify \
RUN docker-php-ext-configure inotify\ && docker-php-ext-install inotify \
&& docker-php-ext-install inotify && rm /tmp/inotify.tar.gz
# cleanup
RUN rm /tmp/inotify.tar.gz
# Install swoole, pcov and mssql driver # 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 && \ 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 && \ apk add --allow-untrusted msodbcsql17_17.5.1.1-1_amd64.apk && \
apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \ apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \
pecl install swoole-${SWOOLE_VERSION} pdo_sqlsrv pcov && \ pecl install swoole-${SWOOLE_VERSION} pdo_sqlsrv-${PDO_SQLSRV_VERSION} pcov && \
docker-php-ext-enable swoole pdo_sqlsrv pcov && \ docker-php-ext-enable swoole pdo_sqlsrv pcov && \
apk del .phpize-deps && \ apk del .phpize-deps && \
rm msodbcsql17_17.5.1.1-1_amd64.apk rm msodbcsql17_17.5.1.1-1_amd64.apk