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 #16110

Merged
merged 1 commit into from
Jan 22, 2024
Merged

Update httpd #16110

merged 1 commit into from
Jan 22, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 22, 2024

Changes:

Changes:

- docker-library/httpd@26548a4: Merge pull request docker-library/httpd#249 from infosiftr/apache-mirrors
- docker-library/httpd@89aed06: Update Apache project mirrors
Copy link

Diff for ccf1d30:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 4472426..7d5905f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,7 +3,7 @@ GitRepo: https://github.com/docker-library/httpd.git
 
 Tags: 2.4.58, 2.4, 2, latest, 2.4.58-bookworm, 2.4-bookworm, 2-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 338f9a4b1e36e09ad2733f36f19e31157f5c959c
+GitCommit: 89aed068235d9a480f245e03edf038621ab8ed8f
 Directory: 2.4
 
 Tags: 2.4.58-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.58-alpine3.19, 2.4-alpine3.19, 2-alpine3.19, alpine3.19
diff --git a/httpd_bookworm/Dockerfile b/httpd_bookworm/Dockerfile
index 55627a5..9bf1231 100644
--- a/httpd_bookworm/Dockerfile
+++ b/httpd_bookworm/Dockerfile
@@ -63,12 +63,9 @@ RUN set -eux; \
 		local success=; \
 		local distUrl=; \
 		for distUrl in \
-# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
-			'https://www.apache.org/dyn/closer.cgi?action=download&filename=' \
-# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/
-			https://downloads.apache.org/ \
-			https://www-us.apache.org/dist/ \
-			https://www.apache.org/dist/ \
+# https://apache.org/history/mirror-history.html
+			https://dlcdn.apache.org/ \
+# if the version is outdated, we have to pull from the archive
 			https://archive.apache.org/dist/ \
 		; do \
 			if wget -O "$f" "$distUrl$distFile" && [ -s "$f" ]; then \

Relevant Maintainers:

@yosifkit yosifkit merged commit c805936 into docker-library:master Jan 22, 2024
7 checks passed
@yosifkit yosifkit deleted the httpd branch January 22, 2024 22:29
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.

None yet

3 participants