From f2602bd98a708c1048e593e67c6ac66f90b2ccc5 Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 3 Mar 2021 13:53:44 +1100 Subject: [PATCH] Update to PHP 8.0 --- .gitlab-ci.yml | 6 +++--- Dockerfile | 4 ++-- Dockerfile.phptest | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acdcbf8..a9f8539 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: variables: BRANCH: mp - VERSION: 7.4-fpm-${BRANCH} + VERSION: 8.0-fpm-${BRANCH} CACHETAG: build-${BRANCH} DOCKER_HOST: tcp://docker:2375 @@ -33,7 +33,7 @@ x86_64:build: stage: build script: - if [ -f init ]; then chmod 500 init; fi - - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "true" + - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || true - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} . - docker push ${CI_REGISTRY_IMAGE}:${VERSION} - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG} @@ -47,7 +47,7 @@ x86_64:build-test: stage: build-test script: - if [ -f init ]; then chmod 500 init; fi - - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "true" + - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || true - docker build --file Dockerfile.phptest --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION}-test . - docker push ${CI_REGISTRY_IMAGE}:${VERSION}-test tags: diff --git a/Dockerfile b/Dockerfile index a97fc9f..bdf4bad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # NAME leenooks/php -# VERSION 7.4-fpm-mp +# VERSION 8.0-fpm-mp -FROM php:7.4-fpm +FROM php:8.0-fpm RUN apt-get update && apt-get install -y openssh-server unzip git msmtp nginx wait-for-it \ && rm /etc/nginx/sites-enabled/default \ diff --git a/Dockerfile.phptest b/Dockerfile.phptest index 2d8b511..fb8181d 100644 --- a/Dockerfile.phptest +++ b/Dockerfile.phptest @@ -1,7 +1,7 @@ # NAME leenooks/php -# VERSION 7.4-fpm-test +# VERSION 8.0-fpm-test -FROM registry.leenooks.net/leenooks/php:7.4-fpm-mp +FROM registry.leenooks.net/leenooks/php:8.0-fpm-mp RUN pecl install xdebug \ && docker-php-ext-enable xdebug