diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38c1cc0af249257776049df02074f8582ecf8009..a79bda0c597c7c3e9d6a714c3a8ad71c5c325226 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 95135059d2c5c2d7042b9ac6c7fd47667cbecf90..4213350cf52754499f821a1648a602367528bc07 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 && \