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 httpd #17116

Merged
merged 1 commit into from
Jul 3, 2024
Merged

Update httpd #17116

merged 1 commit into from
Jul 3, 2024

Conversation

yosifkit
Copy link
Member

@yosifkit yosifkit commented Jul 3, 2024

Changes:

Changes:

- docker-library/httpd@4bbf4e3: Update to 2.4.61
@yosifkit yosifkit requested review from LaurentGoderre and a team as code owners July 3, 2024 20:40
Copy link

github-actions bot commented Jul 3, 2024

Diff for 565bfd9:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 19df8dc..df326b1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,12 +1,12 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/httpd.git
 
-Tags: 2.4.60, 2.4, 2, latest, 2.4.60-bookworm, 2.4-bookworm, 2-bookworm, bookworm
+Tags: 2.4.61, 2.4, 2, latest, 2.4.61-bookworm, 2.4-bookworm, 2-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e5a3d6dac86ee72f2a8101406fb26fc425bb104c
+GitCommit: 4bbf4e38bd43edd3a6aa832eef382b8cfe06cb10
 Directory: 2.4
 
-Tags: 2.4.60-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.60-alpine3.20, 2.4-alpine3.20, 2-alpine3.20, alpine3.20
+Tags: 2.4.61-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.61-alpine3.20, 2.4-alpine3.20, 2-alpine3.20, alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e5a3d6dac86ee72f2a8101406fb26fc425bb104c
+GitCommit: 4bbf4e38bd43edd3a6aa832eef382b8cfe06cb10
 Directory: 2.4/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index d9b1de1..133f2fe 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ httpd:2.4
 httpd:2.4-alpine
 httpd:2.4-alpine3.20
 httpd:2.4-bookworm
-httpd:2.4.60
-httpd:2.4.60-alpine
-httpd:2.4.60-alpine3.20
-httpd:2.4.60-bookworm
+httpd:2.4.61
+httpd:2.4.61-alpine
+httpd:2.4.61-alpine3.20
+httpd:2.4.61-bookworm
 httpd:alpine
 httpd:alpine3.20
 httpd:bookworm
diff --git a/httpd_alpine3.20/Dockerfile b/httpd_alpine3.20/Dockerfile
index e832867..3dae618 100644
--- a/httpd_alpine3.20/Dockerfile
+++ b/httpd_alpine3.20/Dockerfile
@@ -26,8 +26,8 @@ RUN set -eux; \
 		perl \
 	;
 
-ENV HTTPD_VERSION 2.4.60
-ENV HTTPD_SHA256 7b1ec7ec5635da7cb01550513215a90f8b2f52bb7c90cf3e97ede936d3e55b0f
+ENV HTTPD_VERSION 2.4.61
+ENV HTTPD_SHA256 ea8ba86fd95bd594d15e46d25ac5bbda82ae0c9122ad93998cc539c133eaceb6
 
 # https://httpd.apache.org/security/vulnerabilities_24.html
 ENV HTTPD_PATCHES=""
diff --git a/httpd_bookworm/Dockerfile b/httpd_bookworm/Dockerfile
index 3e19d43..76ed029 100644
--- a/httpd_bookworm/Dockerfile
+++ b/httpd_bookworm/Dockerfile
@@ -22,8 +22,8 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*
 
-ENV HTTPD_VERSION 2.4.60
-ENV HTTPD_SHA256 7b1ec7ec5635da7cb01550513215a90f8b2f52bb7c90cf3e97ede936d3e55b0f
+ENV HTTPD_VERSION 2.4.61
+ENV HTTPD_SHA256 ea8ba86fd95bd594d15e46d25ac5bbda82ae0c9122ad93998cc539c133eaceb6
 
 # https://httpd.apache.org/security/vulnerabilities_24.html
 ENV HTTPD_PATCHES=""

Relevant Maintainers:

@tianon tianon merged commit daa6b09 into docker-library:master Jul 3, 2024
7 checks passed
@tianon tianon deleted the httpd branch July 3, 2024 21:25
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.

3 participants