From 399cf06ea649e6942a4039a570fc3a8fcc446ee1 Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 24 Aug 2021 22:55:04 +0200 Subject: [PATCH] pr11 --- README.md | 21 ++++++++++++++------- deploy.sh | 28 ++++++++++++++++------------ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 3853d92..1f6eb07 100644 --- a/README.md +++ b/README.md @@ -33,13 +33,20 @@ First, follow regular update instructions on the website (uploading files etc). ## Available tags | Tag | NamelessMC version | PHP version | Receives updates\* | Notes | --- | ------------------ | ----------- | ---------------- | ----- -v2-pr7 | v2.0.0-pr7 | 7.4 | Yes | Old -v2-pr8 | v2.0.0-pr8 | 7.4 | Yes | Old -v2-pr9 | v2.0.0-pr9 | 7.4 | Yes | Old -v2-pr9-php8 | v2.0.0-pr9 | 8.0 | Yes | Old, php 7.4 recommended -**v2-pr10** | **v2.0.0-pr10** | **8.0** | **Yes** | **Recommended** -v2-pr10-php74 | v2.0.0-pr10 | 7.4 | Yes | Use if you experience php 8 related bugs +**v2-pr11** | **v2.0.0-pr11** | **8.0** | **Yes** | **Recommended** +v2-pr11-php74 | v2.0.0-pr11 | 7.4 | Yes | For compatibility with legacy modules dev | v2 development | 7.4 | Yes | Testing only, reinstall frequently. dev-php8 | v2 development | 8.0 | Yes | Testing only, reinstall frequently. -\* Image updates, not NamelessMC updates +### Legacy tags + +| Tag | NamelessMC version | PHP version | Receives updates\* | Notes +| --- | ------------------ | ----------- | ---------------- | ----- +v2-pr7 | v2.0.0-pr7 | 7.4 | Yes | +v2-pr8 | v2.0.0-pr8 | 7.4 | Yes | +v2-pr9 | v2.0.0-pr9 | 7.4 | Yes | +v2-pr9-php8 | v2.0.0-pr9 | 8.0 | Yes | Experimental +v2-pr10 | v2.0.0-pr10 | 8.0 | Yes | Use PHP 7.4 for compatibility +v2-pr10-php74 | v2.0.0-pr10 | 7.4 | Yes | + +\* Image updates, not NamelessMC updates. Only the latest NamelessMC version is supported. diff --git a/deploy.sh b/deploy.sh index 002ba43..ee67fb2 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,21 +10,23 @@ set -e export DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build \ - -t namelessmc/nginx:v2-pr7 \ - -t namelessmc/nginx:v2-pr8 \ - -t namelessmc/nginx:v2-pr9 \ - -t namelessmc/nginx:v2-pr9-php8 \ - -t namelessmc/nginx:v2-pr10 \ - -t namelessmc/nginx:v2-pr10-php74 \ - -t namelessmc/nginx:dev \ - -t namelessmc/nginx:dev-php8 \ - --platform=linux/arm,linux/arm64,linux/amd64 nginx_web --push + -t namelessmc/nginx:v2-pr7 \ + -t namelessmc/nginx:v2-pr8 \ + -t namelessmc/nginx:v2-pr9 \ + -t namelessmc/nginx:v2-pr9-php8 \ + -t namelessmc/nginx:v2-pr10 \ + -t namelessmc/nginx:v2-pr10-php74 \ + -t namelessmc/nginx:v2-pr11 \ + -t namelessmc/nginx:v2-pr11-php74 \ + -t namelessmc/nginx:dev \ + -t namelessmc/nginx:dev-php8 \ + --platform=linux/arm,linux/arm64,linux/amd64 nginx_web --push deploy_php(){ docker buildx build \ - -t namelessmc/php:$1 \ - --build-arg PHP_VERSION=$2 --build-arg VERSION=$3 \ - --platform=linux/arm,linux/arm64,linux/amd64 php_fpm --push + -t namelessmc/php:$1 \ + --build-arg PHP_VERSION=$2 --build-arg VERSION=$3 \ + --platform=linux/arm,linux/arm64,linux/amd64 php_fpm --push } # Tag PHP NamelessMC @@ -34,5 +36,7 @@ deploy_php v2-pr9 7.4 v2.0.0-pr9 deploy_php v2-pr9-php8 8.0 v2.0.0-pr9 deploy_php v2-pr10 8.0 v2.0.0-pr10 deploy_php v2-pr10-php74 7.4 v2.0.0-pr10 +deploy_php v2-pr11 8.0 v2.0.0-pr11 +deploy_php v2-pr11-php74 7.4 v2.0.0-pr11 deploy_php dev 7.4 v2 deploy_php dev-php8 8.0 v2