From cd40bc400fbea12f5e76732c6eea3ecd5fd75e4a Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Sun, 12 Jan 2020 12:57:32 +0100
Subject: [PATCH] docker/l3d#34 Add support for PHP 7.3
---
.gitlab-ci.yml | 8 ++++++++
Dockerfile | 7 ++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38c1cc0..a79bda0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,3 +24,11 @@ php-7.2:
- docker push $CI_REGISTRY_IMAGE:php-7.2
only:
- master
+
+php-7.3:
+ stage: build
+ script:
+ - docker build --pull --build-arg ALPINE_VERSION=3.11 --build-arg PHP_VERSION=7.3 -t $CI_REGISTRY_IMAGE:php-7.3 .
+ - docker push $CI_REGISTRY_IMAGE:php-7.3
+ only:
+ - master
diff --git a/Dockerfile b/Dockerfile
index 9513505..4213350 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM alpine:3.8
+ARG ALPINE_VERSION
+
+FROM alpine:${ALPINE_VERSION}
LABEL com.example.vendor="LakeDrops" \
maintainer="juergen.haas@lakedrops.com" \
@@ -87,6 +89,9 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
if [ "${PHP_VERSION}" = "7.2" ]; then \
apk add --no-cache php7-sodium ; \
fi && \
+ if [ "${PHP_VERSION}" = "7.3" ]; then \
+ apk add --no-cache php7-sodium ; \
+ fi && \
rm /etc/apk/repositories && \
mv /etc/apk/repositories.org /etc/apk/repositories && \
apk update && \
--
GitLab