mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-03-28 20:41:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #823 from acelaya-forks/feature/docker-updates

Browse source 
Feature/docker updates
This commit is contained in:
Alejandro Celaya 2020-08-09 11:41:16 +02:00 • committed by GitHub
commit c11c731bef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -44,7 +44,7 @@ before_install:
- phpenv config-rm xdebug.ini || return 0 - phpenv config-rm xdebug.ini || return 0
- sudo ./data/infra/ci/install-ms-odbc.sh - sudo ./data/infra/ci/install-ms-odbc.sh
- docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_ms shlink_db shlink_db_postgres shlink_db_maria - docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_ms shlink_db shlink_db_postgres shlink_db_maria
- yes | pecl install pdo_sqlsrv swoole-4.4.18 - yes | pecl install pdo_sqlsrv swoole-4.5.2
install: install:
- composer self-update - composer self-update

1
CHANGELOG.md
View file

@ -27,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
* [#508](https://github.com/shlinkio/shlink/issues/508) Added mutation checks to database tests. * [#508](https://github.com/shlinkio/shlink/issues/508) Added mutation checks to database tests.
* [#790](https://github.com/shlinkio/shlink/issues/790) Updated to doctrine/migrations v3. * [#790](https://github.com/shlinkio/shlink/issues/790) Updated to doctrine/migrations v3.
* [#798](https://github.com/shlinkio/shlink/issues/798) Updated to guzzlehttp/guzzle v7. * [#798](https://github.com/shlinkio/shlink/issues/798) Updated to guzzlehttp/guzzle v7.
* [#822](https://github.com/shlinkio/shlink/issues/822) Updated docker image to use PHP 7.4.9 with Alpine 3.12 and swoole 4.5.2.
#### Deprecated #### Deprecated

6
Dockerfile
View file

@ -1,8 +1,8 @@
FROM php:7.4.5-alpine3.11 as base FROM php:7.4.9-alpine3.12 as base
ARG SHLINK_VERSION=2.1.4 ARG SHLINK_VERSION=2.2.2
ENV SHLINK_VERSION ${SHLINK_VERSION} ENV SHLINK_VERSION ${SHLINK_VERSION}
ENV SWOOLE_VERSION 4.4.18 ENV SWOOLE_VERSION 4.5.2
ENV LC_ALL "C" ENV LC_ALL "C"
WORKDIR /etc/shlink WORKDIR /etc/shlink

2
data/infra/php.Dockerfile
View file

@ -1,4 +1,4 @@
FROM php:7.4.5-fpm-alpine3.11 FROM php:7.4.9-alpine3.12
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com> MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV APCU_VERSION 5.1.18 ENV APCU_VERSION 5.1.18

4
data/infra/swoole.Dockerfile
View file

@ -1,10 +1,10 @@
FROM php:7.4.5-alpine3.11 FROM php:7.4.9-alpine3.12
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com> MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV APCU_VERSION 5.1.18 ENV APCU_VERSION 5.1.18
ENV APCU_BC_VERSION 1.0.5 ENV APCU_BC_VERSION 1.0.5
ENV INOTIFY_VERSION 2.0.0 ENV INOTIFY_VERSION 2.0.0
ENV SWOOLE_VERSION 4.4.18 ENV SWOOLE_VERSION 4.5.2
RUN apk update RUN apk update