From 5190a03113e23a2ef1766aa621fd3792ed70d7c8 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 10 Nov 2020 16:08:22 +0100 Subject: [PATCH] #846 Fixed base image used for PHP-FPM dev container --- CHANGELOG.md | 1 + Dockerfile | 2 +- data/infra/php.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9dc1fad..3af1a15f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this ### Fixed * [#891](https://github.com/shlinkio/shlink/issues/891) Fixed error when running migrations in postgres due to incorrect return type hint. +* [#846](https://github.com/shlinkio/shlink/issues/846) Fixed base image used for the PHP-FPM dev container. ## [2.4.0] - 2020-11-08 diff --git a/Dockerfile b/Dockerfile index 04441788..cc7c403d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM php:7.4.11-alpine3.12 as base -ARG SHLINK_VERSION=2.3.0 +ARG SHLINK_VERSION=2.4.0 ENV SHLINK_VERSION ${SHLINK_VERSION} ENV SWOOLE_VERSION 4.5.5 ENV LC_ALL "C" diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile index e419ba6b..884f2f2e 100644 --- a/data/infra/php.Dockerfile +++ b/data/infra/php.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.11-alpine3.12 +FROM php:7.4.11-fpm-alpine3.12 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.18