From 755a52b78e8cf838e56c1163a2bfc36ef0e8dd69 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 30 Jan 2021 09:45:47 +0100 Subject: [PATCH] Updated official docker image to PHP 8 --- CHANGELOG.md | 1 + Dockerfile | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0481274b..86dacaa0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this ### Changed * [#977](https://github.com/shlinkio/shlink/issues/977) Migrated from `laminas/laminas-paginator` to `pagerfanta/core` to handle pagination. +* [#986](https://github.com/shlinkio/shlink/issues/986) Updated official docker image to use PHP 8. ### Deprecated * *Nothing* diff --git a/Dockerfile b/Dockerfile index 9d7e0bef..8d17f662 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM php:7.4.11-alpine3.12 as base +FROM php:8.0.1-alpine3.13 as base -ARG SHLINK_VERSION=2.4.0 -ENV SHLINK_VERSION ${SHLINK_VERSION} -ENV SWOOLE_VERSION 4.5.9 +ARG SHLINK_VERSION=2.5.2 +ENV SWOOLE_VERSION 4.6.2 +ENV PDO_SQLSRV_VERSION 5.9.0 ENV LC_ALL "C" WORKDIR /etc/shlink @@ -32,7 +32,7 @@ RUN if [ $(uname -m) == "x86_64" ]; then \ 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 --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} unixodbc-dev && \ - pecl install pdo_sqlsrv && \ + pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} && \ docker-php-ext-enable pdo_sqlsrv && \ apk del .phpize-deps && \ rm msodbcsql17_17.5.1.1-1_amd64.apk ; \