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

Feature/docker updates

.travis.yml

@@ -44,7 +44,7 @@ before_install:
   - phpenv config-rm xdebug.ini || return 0
   - 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
-  - yes | pecl install pdo_sqlsrv swoole-4.4.18
+  - yes | pecl install pdo_sqlsrv swoole-4.5.2
 
 install:
   - composer self-update

CHANGELOG.md

@@ -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.
 * [#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.
+* [#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
 

Dockerfile

@@ -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 SWOOLE_VERSION 4.4.18
+ENV SWOOLE_VERSION 4.5.2
 ENV LC_ALL "C"
 
 WORKDIR /etc/shlink

data/infra/php.Dockerfile

@@ -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>
 
 ENV APCU_VERSION 5.1.18

data/infra/swoole.Dockerfile

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