From d2dc26ed580547a979624a526c47da844512fa66 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Fri, 18 Feb 2022 16:50:07 +0100
Subject: [PATCH] docker/l3d#110 A support for PHP 8.1
---
.gitlab-ci.yml | 49 ++++++-----------------------------------------
run/scripts/reset | 2 ++
run/scripts/start | 1 +
3 files changed, 9 insertions(+), 43 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a35272..315dc47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,50 +22,13 @@ run:
only:
- tags
-php-7.0:
+php:
stage: build
+ parallel:
+ matrix:
+ - PHP: ['7.0','7.1','7.2','7.3','7.4','8.0','8.1']
script:
- - docker build --pull --build-arg PHP_VERSION=7.0 --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-7.0:${VERSION} .
- - docker push ${CI_REGISTRY_IMAGE}/php-7.0:${VERSION}
- only:
- - tags
-
-php-7.1:
- stage: build
- script:
- - docker build --pull --build-arg PHP_VERSION=7.1 --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-7.1:${VERSION} .
- - docker push ${CI_REGISTRY_IMAGE}/php-7.1:${VERSION}
- only:
- - tags
-
-php-7.2:
- stage: build
- script:
- - docker build --pull --build-arg PHP_VERSION=7.2 --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-7.2:${VERSION} .
- - docker push ${CI_REGISTRY_IMAGE}/php-7.2:${VERSION}
- only:
- - tags
-
-php-7.3:
- stage: build
- script:
- - docker build --pull --build-arg PHP_VERSION=7.3 --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-7.3:${VERSION} .
- - docker push ${CI_REGISTRY_IMAGE}/php-7.3:${VERSION}
- only:
- - tags
-
-php-7.4:
- stage: build
- script:
- - docker build --pull --build-arg PHP_VERSION=7.4 --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-7.4:${VERSION} .
- - docker push ${CI_REGISTRY_IMAGE}/php-7.4:${VERSION}
- only:
- - tags
-
-php-8.0:
- stage: build
- script:
- - docker build --pull --build-arg PHP_VERSION=8.0 --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-8.0:${VERSION} .
- - docker push ${CI_REGISTRY_IMAGE}/php-8.0:${VERSION}
+ - docker build --pull --build-arg PHP_VERSION=${PHP} --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} .
+ - docker push ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION}
only:
- tags
diff --git a/run/scripts/reset b/run/scripts/reset
index ced61f0..e9e72c7 100755
--- a/run/scripts/reset
+++ b/run/scripts/reset
@@ -17,6 +17,8 @@ export PHP_VERSION=7.4
/usr/local/bin/update
export PHP_VERSION=8.0
/usr/local/bin/update
+export PHP_VERSION=8.1
+/usr/local/bin/update
echo "Cleaning old container"
docker kill l3drun >/dev/null
diff --git a/run/scripts/start b/run/scripts/start
index f48c393..8256606 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -11,6 +11,7 @@ function getConfig() {
7.3) break ;;
7.4) break ;;
8.0) break ;;
+ 8.1) break ;;
*) echo "Version not supported." ;;
esac
done
--
GitLab