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 haproxy #8038

Merged
merged 1 commit into from
May 20, 2020
Merged

Update haproxy #8038

merged 1 commit into from
May 20, 2020

Conversation

tianon
Copy link
Member

@tianon tianon commented May 20, 2020

Changes:

Changes:

- docker-library/haproxy@507ed10: Add link to upstream download page which makes the LTS split more clear
- docker-library/haproxy@26056c5: Merge pull request docker-library/haproxy#79 from TimWolla/lts
@github-actions
Copy link

Diff for 9ca4a3b:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 338fd0d..c6b9fe3 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -41,12 +41,12 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: bfa23c19cffdb4247474b2138feeeb14f48b7fe4
 Directory: 1.9/alpine
 
-Tags: 2.0.14, 2.0
+Tags: 2.0.14, 2.0, lts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: eeaaa570ccaeec6fa7e545b9314d6f246b6b283c
 Directory: 2.0
 
-Tags: 2.0.14-alpine, 2.0-alpine
+Tags: 2.0.14-alpine, 2.0-alpine, lts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: bfa23c19cffdb4247474b2138feeeb14f48b7fe4
 Directory: 2.0/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 0697047..3a9104a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -30,3 +30,5 @@ haproxy:2.2-rc
 haproxy:2.2-rc-alpine
 haproxy:alpine
 haproxy:latest
+haproxy:lts
+haproxy:lts-alpine
diff --git a/haproxy_2.0-alpine/Dockerfile b/haproxy_lts-alpine/Dockerfile
similarity index 100%
rename from haproxy_2.0-alpine/Dockerfile
rename to haproxy_lts-alpine/Dockerfile
diff --git a/haproxy_2.0-alpine/docker-entrypoint.sh b/haproxy_lts-alpine/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.0-alpine/docker-entrypoint.sh
rename to haproxy_lts-alpine/docker-entrypoint.sh
diff --git a/haproxy_2.0/Dockerfile b/haproxy_lts/Dockerfile
similarity index 100%
rename from haproxy_2.0/Dockerfile
rename to haproxy_lts/Dockerfile
diff --git a/haproxy_2.0/docker-entrypoint.sh b/haproxy_lts/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.0/docker-entrypoint.sh
rename to haproxy_lts/docker-entrypoint.sh

@tianon tianon merged commit d106641 into docker-library:master May 20, 2020
@tianon tianon deleted the haproxy branch May 20, 2020 16:33
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.

2 participants