From ac6a12bf823d750d51c033f9e361eec60c15b1d0 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 15 Oct 2020 13:50:12 +0200
Subject: [PATCH] docker/l3d#46 Add container for PHP 7.4
---
.gitlab-ci.yml | 8 ++++++++
CHANGELOG | 4 ++++
Dockerfile | 3 +++
3 files changed, 15 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0720c9..c4ff9a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,3 +35,11 @@ php-7.3:
- docker push $CI_REGISTRY_IMAGE:php-7.3
only:
- master
+
+php-7.4:
+ stage: build
+ script:
+ - docker build --pull --build-arg ALPINE_VERSION=3.11 --build-arg PHP_VERSION=7.4 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-7.4 .
+ - docker push $CI_REGISTRY_IMAGE:php-7.4
+ only:
+ - master
diff --git a/CHANGELOG b/CHANGELOG
index 2abb82d..666dd5a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+v1.5.0 2020-10-15
+-----------------
+Add container for PHP 7.4
+
v1.4.4 2020-05-22
-----------------
Take different approach to fix iconv() notices
diff --git a/Dockerfile b/Dockerfile
index 084d1a6..15beadd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -97,6 +97,9 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
if [ "${PHP_VERSION}" = "7.3" ]; then \
apk add --no-cache php7-sodium gnu-libiconv ; \
fi && \
+ if [ "${PHP_VERSION}" = "7.4" ]; then \
+ apk add --no-cache php7-sodium gnu-libiconv ; \
+ fi && \
rm /etc/apk/repositories && \
mv /etc/apk/repositories.org /etc/apk/repositories && \
apk update && \
--
GitLab