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

Merged
merged 1 commit into from
Aug 3, 2020
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Aug 3, 2020

Changes:

Changes:

- docker-library/haproxy@947eebe: Update to 1.8.26
- docker-library/haproxy@0b1cc77: Merge pull request docker-library/haproxy#129 from infosiftr/1.9-eol
- docker-library/haproxy@6699273: Remove "haproxy:1" alias (instead of downgrading it to 1.8, which is LTS)
- docker-library/haproxy@24c34a7: Remove EOL 1.9 series
@github-actions
Copy link

github-actions bot commented Aug 3, 2020

Diff for a35c0c3:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e560f48..a43289e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -11,26 +11,16 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: e538b03ce98ce2c9bb9e6e0db26d87ad45a137d0
 Directory: 1.7/alpine
 
-Tags: 1.8.25, 1.8
+Tags: 1.8.26, 1.8
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: eeaaa570ccaeec6fa7e545b9314d6f246b6b283c
+GitCommit: 947eebe116d8256622545d804982620ceb18f88b
 Directory: 1.8
 
-Tags: 1.8.25-alpine, 1.8-alpine
+Tags: 1.8.26-alpine, 1.8-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e538b03ce98ce2c9bb9e6e0db26d87ad45a137d0
+GitCommit: 947eebe116d8256622545d804982620ceb18f88b
 Directory: 1.8/alpine
 
-Tags: 1.9.16, 1.9, 1
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 1a794eaa3bde25a2a09f5ff88f3f2b792bd319bb
-Directory: 1.9
-
-Tags: 1.9.16-alpine, 1.9-alpine, 1-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1a794eaa3bde25a2a09f5ff88f3f2b792bd319bb
-Directory: 1.9/alpine
-
 Tags: 2.0.17, 2.0
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: c8d4c15cee0f5b6ad6b226a61cec408c44f19d6d
diff --git a/_bashbrew-list b/_bashbrew-list
index ec7db4e..040c91f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,17 +1,11 @@
-haproxy:1
-haproxy:1-alpine
 haproxy:1.7
 haproxy:1.7-alpine
 haproxy:1.7.12
 haproxy:1.7.12-alpine
 haproxy:1.8
 haproxy:1.8-alpine
-haproxy:1.8.25
-haproxy:1.8.25-alpine
-haproxy:1.9
-haproxy:1.9-alpine
-haproxy:1.9.16
-haproxy:1.9.16-alpine
+haproxy:1.8.26
+haproxy:1.8.26-alpine
 haproxy:2.0
 haproxy:2.0-alpine
 haproxy:2.0.17
diff --git a/haproxy_1-alpine/Dockerfile b/haproxy_1-alpine/Dockerfile
deleted file mode 100644
index e23e845..0000000
diff --git a/haproxy_1-alpine/docker-entrypoint.sh b/haproxy_1-alpine/docker-entrypoint.sh
deleted file mode 100755
index 8b2093b..0000000
diff --git a/haproxy_1.8-alpine/Dockerfile b/haproxy_1.8-alpine/Dockerfile
index c75885a..38ddc64 100644
--- a/haproxy_1.8-alpine/Dockerfile
+++ b/haproxy_1.8-alpine/Dockerfile
@@ -1,9 +1,9 @@
 # vim:set ft=dockerfile:
 FROM alpine:3.12
 
-ENV HAPROXY_VERSION 1.8.25
-ENV HAPROXY_URL https://www.haproxy.org/download/1.8/src/haproxy-1.8.25.tar.gz
-ENV HAPROXY_SHA256 62c0b77de2275a54a443a869947ddcca2bad7bdc1cafd804732a0e0d59b1708b
+ENV HAPROXY_VERSION 1.8.26
+ENV HAPROXY_URL https://www.haproxy.org/download/1.8/src/haproxy-1.8.26.tar.gz
+ENV HAPROXY_SHA256 e3c2a81b6f26dcb736a34ebb5f134d3251ceccf30386214655fa7ed6d3afa400
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -x \
diff --git a/haproxy_1.8/Dockerfile b/haproxy_1.8/Dockerfile
index c242899..9f02543 100644
--- a/haproxy_1.8/Dockerfile
+++ b/haproxy_1.8/Dockerfile
@@ -1,9 +1,9 @@
 # vim:set ft=dockerfile:
 FROM debian:buster-slim
 
-ENV HAPROXY_VERSION 1.8.25
-ENV HAPROXY_URL https://www.haproxy.org/download/1.8/src/haproxy-1.8.25.tar.gz
-ENV HAPROXY_SHA256 62c0b77de2275a54a443a869947ddcca2bad7bdc1cafd804732a0e0d59b1708b
+ENV HAPROXY_VERSION 1.8.26
+ENV HAPROXY_URL https://www.haproxy.org/download/1.8/src/haproxy-1.8.26.tar.gz
+ENV HAPROXY_SHA256 e3c2a81b6f26dcb736a34ebb5f134d3251ceccf30386214655fa7ed6d3afa400
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -x \
diff --git a/haproxy_1/Dockerfile b/haproxy_1/Dockerfile
deleted file mode 100644
index f3a6a8c..0000000
diff --git a/haproxy_1/docker-entrypoint.sh b/haproxy_1/docker-entrypoint.sh
deleted file mode 100755
index 8b2093b..0000000

@yosifkit yosifkit merged commit 6365a2c into docker-library:master Aug 3, 2020
@yosifkit yosifkit deleted the haproxy branch August 3, 2020 20:12
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