From 909468030c29543fc40764e0420be1298b4cdb64 Mon Sep 17 00:00:00 2001 From: Robin Date: Sun, 27 Jun 2021 20:52:17 +0200 Subject: [PATCH] actually use php 7.4 for php 7.4 image --- deploy.sh | 4 +++- docker-compose.yml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/deploy.sh b/deploy.sh index 82f5988..002ba43 100755 --- a/deploy.sh +++ b/deploy.sh @@ -14,6 +14,8 @@ docker buildx build \ -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 @@ -31,6 +33,6 @@ deploy_php v2-pr8 7.4 v2.0.0-pr8 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 8.0 v2.0.0-pr10 +deploy_php v2-pr10-php74 7.4 v2.0.0-pr10 deploy_php dev 7.4 v2 deploy_php dev-php8 8.0 v2 diff --git a/docker-compose.yml b/docker-compose.yml index d07ab84..6d5e16e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: nginx: - image: namelessmc/nginx:v2-pr9 + image: namelessmc/nginx:v2-pr10 ports: ['80:80'] volumes: ['./web:/data'] # same as php container # environment: @@ -12,7 +12,7 @@ services: restart: always php: - image: namelessmc/php:v2-pr9 + image: namelessmc/php:v2-pr10 volumes: ['./web:/data'] # same as web container restart: always