Skip to content

Commit 6f5c597

Browse files
tobybellwoodtobybellwood
authored
Merge pull request #1590 from uselagoon/remove-php81
Remove PHP 8.1 Docker images and references
2 parents 357c217 + b9eae83 commit 6f5c597

File tree

5 files changed

+0
-216
lines changed

5 files changed

+0
-216
lines changed

‎docker-bake.hcl‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ group "default" {
7979
"node-24-cli",
8080
"opensearch-2",
8181
"opensearch-3",
82-
"php-8-1-fpm",
83-
"php-8-1-cli",
84-
"php-8-1-cli-drupal",
8582
"php-8-2-fpm",
8683
"php-8-2-cli",
8784
"php-8-2-cli-drupal",
@@ -195,9 +192,6 @@ group "opensearch" {
195192
group "php" {
196193
targets = [
197194
"commons",
198-
"php-8-1-fpm",
199-
"php-8-1-cli",
200-
"php-8-1-cli-drupal",
201195
"php-8-2-fpm",
202196
"php-8-2-cli",
203197
"php-8-2-cli-drupal",
@@ -517,36 +511,6 @@ target "opensearch-3" {
517511
tags = tags("opensearch-3")
518512
}
519513

520-
target "php-8-1-fpm" {
521-
inherits = ["default"]
522-
context = "images/php-fpm"
523-
contexts = {
524-
"${LOCAL_REPO}/commons": "target:commons"
525-
}
526-
dockerfile = "8.1.Dockerfile"
527-
tags = tags("php-8.1-fpm")
528-
}
529-
530-
target "php-8-1-cli" {
531-
inherits = ["default"]
532-
context = "images/php-cli"
533-
contexts = {
534-
"${LOCAL_REPO}/php-8.1-fpm": "target:php-8-1-fpm"
535-
}
536-
dockerfile = "8.1.Dockerfile"
537-
tags = tags("php-8.1-cli")
538-
}
539-
540-
target "php-8-1-cli-drupal" {
541-
inherits = ["default"]
542-
context = "images/php-cli-drupal"
543-
contexts = {
544-
"${LOCAL_REPO}/php-8.1-cli": "target:php-8-1-cli"
545-
}
546-
dockerfile = "8.1.Dockerfile"
547-
tags = tags("php-8.1-cli-drupal")
548-
}
549-
550514
target "php-8-2-fpm" {
551515
inherits = ["default"]
552516
context = "images/php-fpm"

‎helpers/TESTING_base_images_dockercompose.md‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ docker compose pull || true
2222
docker compose build && docker compose up -d
2323

2424
# Ensure long-running pods are ready to connect
25-
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://php-8-1-dev:9000 -timeout 1m
2625
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://php-8-2-dev:9000 -timeout 1m
2726
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://php-8-3-dev:9000 -timeout 1m
2827
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://php-8-4-dev:9000 -timeout 1m
@@ -40,8 +39,6 @@ docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep
4039
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep node-20
4140
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep node-22
4241
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep node-24
43-
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep php-8-1-dev
44-
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep php-8-1-prod
4542
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep php-8-2-dev
4643
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep php-8-2-prod
4744
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep php-8-3-dev
@@ -63,48 +60,6 @@ docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep
6360
# commons should be running Alpine Linux
6461
docker compose exec -T commons sh -c "cat /etc/os-release" | grep "Alpine Linux"
6562

66-
# PHP 8.1 development should have PHP installed
67-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "PHP Version" | grep "8.1"
68-
docker compose exec -T php-8-1-dev bash -c "php -i" | grep "PHP Version" | grep "8.1"
69-
70-
# PHP 8.1 development should have modules enabled
71-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "APCu Support" | grep "Enabled"
72-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "LibYAML Support" | grep "enabled"
73-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "Redis Support" | grep "enabled"
74-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "imagick module" | grep "enabled"
75-
76-
# PHP 8.1 development should have default configuration.
77-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "memory_limit" | grep "400M"
78-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "short_open_tag" | grep "On"
79-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "max_execution_time" | grep "900"
80-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "max_input_time" | grep "900"
81-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "post_max_size" | grep "2048M"
82-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "max_input_vars" | grep "2000"
83-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "max_file_uploads" | grep "20"
84-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "session.cookie_samesite" | grep "no value"
85-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "display_errors" | grep "Off"
86-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "date.timezone" | grep "UTC"
87-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "opcache.memory_consumption" | grep "256"
88-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "error_reporting" | grep "22527"
89-
docker compose exec -T php-8-1-dev bash -c "php -i" | grep "sendmail_path" | grep "/usr/sbin/sendmail -t -i"
90-
91-
# PHP 8.1 development should have extensions enabled.
92-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "xdebug.client_port" | grep "9003"
93-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "PHP_IDE_CONFIG" | grep "serverName=lagoon"
94-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "xdebug.log" | grep "/tmp/xdebug.log"
95-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "newrelic.appname" | grep "noproject-nobranch"
96-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "newrelic.logfile" | grep "/dev/stderr"
97-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "newrelic.application_logging.forwarding.enabled" | grep "disabled"
98-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "Blackfire" | grep "enabled"
99-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "blackfire.agent_socket" | grep "tcp://127.0.0.1:8307"
100-
101-
# PHP 8.1 production should have overridden configuration.
102-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-prod:9000" | grep "max_input_vars" | grep "4000"
103-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-prod:9000" | grep "max_file_uploads" | grep "40"
104-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-prod:9000" | grep "session.cookie_samesite" | grep "Strict"
105-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-prod:9000" | grep "upload_max_filesize" | grep "1024M"
106-
docker compose exec -T commons sh -c "curl -kL http://php-8-1-prod:9000" | grep "error_reporting" | grep "22519"
107-
10863
# PHP 8.2 development should have PHP installed
10964
docker compose exec -T commons sh -c "curl -kL http://php-8-2-dev:9000" | grep "PHP Version" | grep "8.2"
11065
docker compose exec -T php-8-2-dev bash -c "php -i" | grep "PHP Version" | grep "8.2"

‎helpers/images-docker-compose.yml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -41,39 +41,6 @@ services:
4141
exec http-server -p 3000
4242
"]
4343
44-
php-8-1-dev:
45-
image: uselagoon/php-8.1-cli:latest
46-
ports:
47-
- "9000"
48-
environment:
49-
- LAGOON_ENVIRONMENT_TYPE=development
50-
- XDEBUG_ENABLE=true
51-
- XDEBUG_LOG=true
52-
- NEWRELIC_ENABLED=true
53-
- BLACKFIRE_ENABLED=true
54-
- NEWRELIC_APPLICATION_LOGGING_FORWARDING_ENABLED=false
55-
<< : *default-user # uses the defined user from top
56-
command: ["sh", "-c", "
57-
echo PD9waHAKCnBocGluZm8oICk7Cgo/Pg== | base64 -d > /app/index.php;
58-
exec php -S 0.0.0.0:9000
59-
"] # runs a webserver with phpinfo output
60-
61-
php-8-1-prod:
62-
image: uselagoon/php-8.1-cli:latest
63-
ports:
64-
- "9000"
65-
environment:
66-
- LAGOON_ENVIRONMENT_TYPE=production
67-
- PHP_MAX_INPUT_VARS=4000
68-
- PHP_MAX_FILE_UPLOADS=40
69-
- PHP_SESSION_COOKIE_SAMESITE="Strict"
70-
- PHP_UPLOAD_MAX_FILESIZE=1024M
71-
<< : *default-user # uses the defined user from top
72-
command: ["sh", "-c", "
73-
echo PD9waHAKCnBocGluZm8oICk7Cgo/Pg== | base64 -d > /app/index.php;
74-
exec php -S 0.0.0.0:9000
75-
"] # runs a webserver with phpinfo output
76-
7744
php-8-2-dev:
7845
image: uselagoon/php-8.2-cli:latest
7946
ports:

‎images/php-cli-drupal/8.1.Dockerfile‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎images/php-cli/8.1.Dockerfile‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)