From 3af66b2b92bd3ff735bf9c96b5210f3c24e7c5b4 Mon Sep 17 00:00:00 2001
From: Alan Nelson <alan.nelson@nebraska.edu>
Date: Mon, 2 Oct 2023 15:52:57 -0500
Subject: [PATCH] Retire PHP 7.0 containers
---
Makefile | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 13b8784..c095693 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,8 @@ all: php-lint php-unit-test php-browser-test mobile static-code-analysis utility
# Image Groups
####################
-php-lint: php-lint_7.0 php-lint_7.1 php-lint_7.2 php-lint_7.3 php-lint_7.4 php-lint_8.0 php-lint_8.1 php-lint_8.2 php-lint_latest
-php-unit-test: php-unit-test_7.0 php-unit-test_7.1 php-unit-test_7.2 php-unit-test_7.3 php-unit-test_7.4 php-unit-test_8.0 php-unit-test_8.1 php-unit-test_8.2 php-unit-test_latest
+php-lint: php-lint_7.1 php-lint_7.2 php-lint_7.3 php-lint_7.4 php-lint_8.0 php-lint_8.1 php-lint_8.2 php-lint_latest
+php-unit-test: php-unit-test_7.1 php-unit-test_7.2 php-unit-test_7.3 php-unit-test_7.4 php-unit-test_8.0 php-unit-test_8.1 php-unit-test_8.2 php-unit-test_latest
php-browser-test: php-browser-test_8.2 php-browser-test_latest
mobile: android-build-server
static-code-analysis: static-code-analysis_latest static-code-analysys_php static-code-analysys_python static-code-analysys_android
@@ -34,9 +34,6 @@ dotnet: dotnet_3.1 dotnet_6.0
# PHP Lint Images
####################
-php-lint_7.0: php-lint/7.0/Dockerfile
- docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-lint:7.0 -f php-lint/7.0/Dockerfile php-lint
-
php-lint_7.1: php-lint/7.1/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-lint:7.1 -f php-lint/7.1/Dockerfile php-lint
@@ -63,9 +60,6 @@ php-lint_latest: php-lint_8.2
# PHP Unit Test Images
####################
-php-unit-test_7.0: php-unit-test/7.0/Dockerfile
- docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-unit-test:7.0 -f php-unit-test/7.0/Dockerfile php-unit-test
-
php-unit-test_7.1: php-unit-test/7.1/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-unit-test:7.1 -f php-unit-test/7.1/Dockerfile php-unit-test
--
GitLab