From c708df2029b75ec1687d069691dd11197e0b012f Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 9 Aug 2020 11:13:14 +0200 Subject: [PATCH] Updated to latest docker --- .travis.yml | 2 +- Dockerfile | 6 +++--- data/infra/php.Dockerfile | 2 +- data/infra/swoole.Dockerfile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c36f9984..29395d33 100644 --- a/.travis.yml +++ b/.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 diff --git a/Dockerfile b/Dockerfile index 75c4ae2d..1cd764e0 100644 --- a/Dockerfile +++ b/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 diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile index 33b654c5..5b0ac28a 100644 --- a/data/infra/php.Dockerfile +++ b/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 ENV APCU_VERSION 5.1.18 diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile index 9d8d4240..70d52fa1 100644 --- a/data/infra/swoole.Dockerfile +++ b/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 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