From d9ae83a92b9bbdcaf493c61da801bce33bd3bfe3 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Thu, 7 May 2020 10:16:20 +0200 Subject: [PATCH] Updated everything related with dependencies in docker images --- .travis.yml | 2 +- Dockerfile | 11 ++++------- data/infra/php.Dockerfile | 7 ++----- data/infra/swoole.Dockerfile | 9 +++------ docker-compose.yml | 8 ++++---- 5 files changed, 14 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index a95bf67d..6ab12fa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ cache: before_install: - 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.15 + - yes | pecl install pdo_sqlsrv swoole-4.4.18 - echo 'extension = apcu.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - phpenv config-rm xdebug.ini || return 0 diff --git a/Dockerfile b/Dockerfile index 64cd7ebe..3f2c5856 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM php:7.4.2-alpine3.11 as base +FROM php:7.4.5-alpine3.11 as base -ARG SHLINK_VERSION=2.0.5 +ARG SHLINK_VERSION=2.1.4 ENV SHLINK_VERSION ${SHLINK_VERSION} -ENV SWOOLE_VERSION 4.4.15 +ENV SWOOLE_VERSION 4.4.18 ENV LC_ALL "C" WORKDIR /etc/shlink @@ -25,15 +25,12 @@ RUN \ # Install swoole 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 && \ - wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/mssql-tools_17.5.1.1-1_amd64.apk && \ apk add --allow-untrusted msodbcsql17_17.5.1.1-1_amd64.apk && \ - apk add --allow-untrusted mssql-tools_17.5.1.1-1_amd64.apk && \ apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \ pecl install swoole-${SWOOLE_VERSION} pdo_sqlsrv && \ docker-php-ext-enable swoole pdo_sqlsrv && \ apk del .phpize-deps && \ - rm msodbcsql17_17.5.1.1-1_amd64.apk && \ - rm mssql-tools_17.5.1.1-1_amd64.apk + rm msodbcsql17_17.5.1.1-1_amd64.apk # Install shlink diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile index c5401651..33b654c5 100644 --- a/data/infra/php.Dockerfile +++ b/data/infra/php.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.2-fpm-alpine3.11 +FROM php:7.4.5-fpm-alpine3.11 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.18 @@ -67,15 +67,12 @@ RUN rm /tmp/xdebug.tar.gz # Install 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 && \ - wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/mssql-tools_17.5.1.1-1_amd64.apk && \ apk add --allow-untrusted msodbcsql17_17.5.1.1-1_amd64.apk && \ - apk add --allow-untrusted mssql-tools_17.5.1.1-1_amd64.apk && \ apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \ pecl install pdo_sqlsrv && \ docker-php-ext-enable pdo_sqlsrv && \ apk del .phpize-deps && \ - rm msodbcsql17_17.5.1.1-1_amd64.apk && \ - rm mssql-tools_17.5.1.1-1_amd64.apk + rm msodbcsql17_17.5.1.1-1_amd64.apk # Install composer RUN php -r "readfile('https://getcomposer.org/installer');" | php diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile index 3f7a1513..9d8d4240 100644 --- a/data/infra/swoole.Dockerfile +++ b/data/infra/swoole.Dockerfile @@ -1,10 +1,10 @@ -FROM php:7.4.2-alpine3.11 +FROM php:7.4.5-alpine3.11 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.15 +ENV SWOOLE_VERSION 4.4.18 RUN apk update @@ -68,15 +68,12 @@ RUN rm /tmp/inotify.tar.gz # Install swoole 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 && \ - wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/mssql-tools_17.5.1.1-1_amd64.apk && \ apk add --allow-untrusted msodbcsql17_17.5.1.1-1_amd64.apk && \ - apk add --allow-untrusted mssql-tools_17.5.1.1-1_amd64.apk && \ apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \ pecl install swoole-${SWOOLE_VERSION} pdo_sqlsrv && \ docker-php-ext-enable swoole pdo_sqlsrv && \ apk del .phpize-deps && \ - rm msodbcsql17_17.5.1.1-1_amd64.apk && \ - rm mssql-tools_17.5.1.1-1_amd64.apk + rm msodbcsql17_17.5.1.1-1_amd64.apk # Install composer RUN php -r "readfile('https://getcomposer.org/installer');" | php diff --git a/docker-compose.yml b/docker-compose.yml index 36153ad2..d700f3b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -79,7 +79,7 @@ services: shlink_db_postgres: container_name: shlink_db_postgres - image: postgres:10.7-alpine + image: postgres:12.2-alpine ports: - "5433:5432" volumes: @@ -92,7 +92,7 @@ services: shlink_db_maria: container_name: shlink_db_maria - image: mariadb:10.2 + image: mariadb:10.5 ports: - "3308:3306" volumes: @@ -114,7 +114,7 @@ services: shlink_redis: container_name: shlink_redis - image: redis:5.0-alpine + image: redis:6.0-alpine ports: - "6380:6379" @@ -131,7 +131,7 @@ services: shlink_mercure: container_name: shlink_mercure - image: dunglas/mercure:v0.8 + image: dunglas/mercure:v0.9 ports: - "3080:80" environment: