Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update drupal #18212

Merged
merged 1 commit into from
Jan 9, 2025
Merged

Update drupal #18212

merged 1 commit into from
Jan 9, 2025

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 8, 2025

Changes:

Changes:

- docker-library/drupal@2897342: Remove more 7.x leftovers (EOL)
- docker-library/drupal@9dfed8b: Update 7
@tianon tianon requested a review from a team as a code owner January 8, 2025 19:51
@tianon
Copy link
Member Author

tianon commented Jan 8, 2025

Copy link

github-actions bot commented Jan 8, 2025

Diff for 3db68b4:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 3616e93..d872b39 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,10 +1,8 @@
 amd64
-arm32v5
 arm32v6
 arm32v7
 arm64v8
 i386
-mips64le
 ppc64le
 riscv64
 s390x
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 246361e..6bb9f8a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,66 +1,6 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/drupal.git
 
-Tags: 7.103-php8.1-apache-bookworm, 7-php8.1-apache-bookworm, 7.103-php8.1-apache, 7-php8.1-apache, 7.103-php8.1, 7-php8.1, 7.103-apache-bookworm, 7-apache-bookworm, 7.103-apache, 7-apache, 7.103, 7
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ce8246b1c6e241574c166301044fdec9a6e24356
-Directory: 7/php8.1/apache-bookworm
-
-Tags: 7.103-php8.1-apache-bullseye, 7-php8.1-apache-bullseye, 7.103-apache-bullseye, 7-apache-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: ce8246b1c6e241574c166301044fdec9a6e24356
-Directory: 7/php8.1/apache-bullseye
-
-Tags: 7.103-php8.1-fpm-alpine3.20, 7-php8.1-fpm-alpine3.20, 7.103-fpm-alpine3.20, 7-fpm-alpine3.20
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: ce8246b1c6e241574c166301044fdec9a6e24356
-Directory: 7/php8.1/fpm-alpine3.20
-
-Tags: 7.103-php8.1-fpm-alpine3.21, 7-php8.1-fpm-alpine3.21, 7.103-php8.1-fpm-alpine, 7-php8.1-fpm-alpine, 7.103-fpm-alpine3.21, 7-fpm-alpine3.21, 7.103-fpm-alpine, 7-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a90d8ccae757671775d2bfdf3668a2c97318ba4c
-Directory: 7/php8.1/fpm-alpine3.21
-
-Tags: 7.103-php8.1-fpm-bookworm, 7-php8.1-fpm-bookworm, 7.103-php8.1-fpm, 7-php8.1-fpm, 7.103-fpm-bookworm, 7-fpm-bookworm, 7.103-fpm, 7-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ce8246b1c6e241574c166301044fdec9a6e24356
-Directory: 7/php8.1/fpm-bookworm
-
-Tags: 7.103-php8.1-fpm-bullseye, 7-php8.1-fpm-bullseye, 7.103-fpm-bullseye, 7-fpm-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: ce8246b1c6e241574c166301044fdec9a6e24356
-Directory: 7/php8.1/fpm-bullseye
-
-Tags: 7.103-php8.2-apache-bookworm, 7-php8.2-apache-bookworm, 7.103-php8.2-apache, 7-php8.2-apache, 7.103-php8.2, 7-php8.2
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ce8246b1c6e241574c166301044fdec9a6e24356
-Directory: 7/php8.2/apache-bookworm
-
-Tags: 7.103-php8.2-apache-bullseye, 7-php8.2-apache-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: ce8246b1c6e241574c166301044fdec9a6e24356
-Directory: 7/php8.2/apache-bullseye
-
-Tags: 7.103-php8.2-fpm-alpine3.20, 7-php8.2-fpm-alpine3.20
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: ce8246b1c6e241574c166301044fdec9a6e24356
-Directory: 7/php8.2/fpm-alpine3.20
-
-Tags: 7.103-php8.2-fpm-alpine3.21, 7-php8.2-fpm-alpine3.21, 7.103-php8.2-fpm-alpine, 7-php8.2-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a90d8ccae757671775d2bfdf3668a2c97318ba4c
-Directory: 7/php8.2/fpm-alpine3.21
-
-Tags: 7.103-php8.2-fpm-bookworm, 7-php8.2-fpm-bookworm, 7.103-php8.2-fpm, 7-php8.2-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ce8246b1c6e241574c166301044fdec9a6e24356
-Directory: 7/php8.2/fpm-bookworm
-
-Tags: 7.103-php8.2-fpm-bullseye, 7-php8.2-fpm-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: ce8246b1c6e241574c166301044fdec9a6e24356
-Directory: 7/php8.2/fpm-bullseye
-
 Tags: 10.3.11-php8.2-apache-bookworm, 10.3-php8.2-apache-bookworm, 10.3.11-php8.2-apache, 10.3-php8.2-apache, 10.3.11-php8.2, 10.3-php8.2, 10.3.11-apache-bookworm, 10.3-apache-bookworm, 10.3.11-apache, 10.3-apache, 10.3.11, 10.3
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 0248576732a79f174053d7c3850ef3ff7426e977
diff --git a/_bashbrew-list b/_bashbrew-list
index 714f6ca..e422232 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,63 +1,3 @@
-drupal:7
-drupal:7-apache
-drupal:7-apache-bookworm
-drupal:7-apache-bullseye
-drupal:7-fpm
-drupal:7-fpm-alpine
-drupal:7-fpm-alpine3.20
-drupal:7-fpm-alpine3.21
-drupal:7-fpm-bookworm
-drupal:7-fpm-bullseye
-drupal:7-php8.1
-drupal:7-php8.1-apache
-drupal:7-php8.1-apache-bookworm
-drupal:7-php8.1-apache-bullseye
-drupal:7-php8.1-fpm
-drupal:7-php8.1-fpm-alpine
-drupal:7-php8.1-fpm-alpine3.20
-drupal:7-php8.1-fpm-alpine3.21
-drupal:7-php8.1-fpm-bookworm
-drupal:7-php8.1-fpm-bullseye
-drupal:7-php8.2
-drupal:7-php8.2-apache
-drupal:7-php8.2-apache-bookworm
-drupal:7-php8.2-apache-bullseye
-drupal:7-php8.2-fpm
-drupal:7-php8.2-fpm-alpine
-drupal:7-php8.2-fpm-alpine3.20
-drupal:7-php8.2-fpm-alpine3.21
-drupal:7-php8.2-fpm-bookworm
-drupal:7-php8.2-fpm-bullseye
-drupal:7.103
-drupal:7.103-apache
-drupal:7.103-apache-bookworm
-drupal:7.103-apache-bullseye
-drupal:7.103-fpm
-drupal:7.103-fpm-alpine
-drupal:7.103-fpm-alpine3.20
-drupal:7.103-fpm-alpine3.21
-drupal:7.103-fpm-bookworm
-drupal:7.103-fpm-bullseye
-drupal:7.103-php8.1
-drupal:7.103-php8.1-apache
-drupal:7.103-php8.1-apache-bookworm
-drupal:7.103-php8.1-apache-bullseye
-drupal:7.103-php8.1-fpm
-drupal:7.103-php8.1-fpm-alpine
-drupal:7.103-php8.1-fpm-alpine3.20
-drupal:7.103-php8.1-fpm-alpine3.21
-drupal:7.103-php8.1-fpm-bookworm
-drupal:7.103-php8.1-fpm-bullseye
-drupal:7.103-php8.2
-drupal:7.103-php8.2-apache
-drupal:7.103-php8.2-apache-bookworm
-drupal:7.103-php8.2-apache-bullseye
-drupal:7.103-php8.2-fpm
-drupal:7.103-php8.2-fpm-alpine
-drupal:7.103-php8.2-fpm-alpine3.20
-drupal:7.103-php8.2-fpm-alpine3.21
-drupal:7.103-php8.2-fpm-bookworm
-drupal:7.103-php8.2-fpm-bullseye
 drupal:10
 drupal:10-apache
 drupal:10-apache-bookworm
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 4d8ad4f..c023ed0 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,15 +1,3 @@
-drupal:7
-drupal:7-apache-bullseye
-drupal:7-fpm
-drupal:7-fpm-alpine
-drupal:7-fpm-alpine3.20
-drupal:7-fpm-bullseye
-drupal:7-php8.2
-drupal:7-php8.2-apache-bullseye
-drupal:7-php8.2-fpm
-drupal:7-php8.2-fpm-alpine
-drupal:7-php8.2-fpm-alpine3.20
-drupal:7-php8.2-fpm-bullseye
 drupal:10
 drupal:10-apache-bullseye
 drupal:10-fpm
diff --git a/drupal_7-apache-bullseye/Dockerfile b/drupal_7-apache-bullseye/Dockerfile
deleted file mode 100644
index 4114c87..0000000
diff --git a/drupal_7-fpm-alpine/Dockerfile b/drupal_7-fpm-alpine/Dockerfile
deleted file mode 100644
index 87f9694..0000000
diff --git a/drupal_7-fpm-alpine3.20/Dockerfile b/drupal_7-fpm-alpine3.20/Dockerfile
deleted file mode 100644
index 0cff363..0000000
diff --git a/drupal_7-fpm-bullseye/Dockerfile b/drupal_7-fpm-bullseye/Dockerfile
deleted file mode 100644
index d5ca733..0000000
diff --git a/drupal_7-fpm/Dockerfile b/drupal_7-fpm/Dockerfile
deleted file mode 100644
index ff2a7bf..0000000
diff --git a/drupal_7-php8.2-apache-bullseye/Dockerfile b/drupal_7-php8.2-apache-bullseye/Dockerfile
deleted file mode 100644
index eaad177..0000000
diff --git a/drupal_7-php8.2-fpm-alpine/Dockerfile b/drupal_7-php8.2-fpm-alpine/Dockerfile
deleted file mode 100644
index 34dd19d..0000000
diff --git a/drupal_7-php8.2-fpm-alpine3.20/Dockerfile b/drupal_7-php8.2-fpm-alpine3.20/Dockerfile
deleted file mode 100644
index 40b3bb3..0000000
diff --git a/drupal_7-php8.2-fpm-bullseye/Dockerfile b/drupal_7-php8.2-fpm-bullseye/Dockerfile
deleted file mode 100644
index f9f19a0..0000000
diff --git a/drupal_7-php8.2-fpm/Dockerfile b/drupal_7-php8.2-fpm/Dockerfile
deleted file mode 100644
index fd6fae8..0000000
diff --git a/drupal_7-php8.2/Dockerfile b/drupal_7-php8.2/Dockerfile
deleted file mode 100644
index 56bc4af..0000000
diff --git a/drupal_7/Dockerfile b/drupal_7/Dockerfile
deleted file mode 100644
index 2e92819..0000000

Relevant Maintainers:

@yosifkit yosifkit merged commit 14ebb1b into docker-library:master Jan 9, 2025
35 checks passed
@yosifkit yosifkit deleted the drupal branch January 9, 2025 21:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants