Skip to content

Add haproxy 1.7#35

Merged
tianon merged 1 commit into
docker-library:masterfrom
TimWolla:1.7
Nov 28, 2016
Merged

Add haproxy 1.7#35
tianon merged 1 commit into
docker-library:masterfrom
TimWolla:1.7

Conversation

@TimWolla
Copy link
Copy Markdown
Contributor

Closes #34

[timwolla@/s/D/o/haproxy (1.7)]diff -Nur 1.6 1.7                                                                                                                                                            16:35:06
diff -Nur 1.6/alpine/Dockerfile 1.7/alpine/Dockerfile
--- 1.6/alpine/Dockerfile	2016-11-27 16:34:19.693358288 +0100
+++ 1.7/alpine/Dockerfile	2016-11-27 16:34:20.177366698 +0100
@@ -1,8 +1,8 @@
 FROM alpine:3.4
 
-ENV HAPROXY_MAJOR 1.6
-ENV HAPROXY_VERSION 1.6.10
-ENV HAPROXY_MD5 6d47461c008b823a0088d19ec30dbe4e
+ENV HAPROXY_MAJOR 1.7
+ENV HAPROXY_VERSION 1.7.0
+ENV HAPROXY_MD5 ab6e169aeb1b53364aacda80c904398a
 
 # see http://sources.debian.net/src/haproxy/1.5.8-1/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -x \
diff -Nur 1.6/Dockerfile 1.7/Dockerfile
--- 1.6/Dockerfile	2016-11-27 16:34:19.685358149 +0100
+++ 1.7/Dockerfile	2016-11-27 16:34:56.305985433 +0100
@@ -2,9 +2,9 @@
 
 RUN apt-get update && apt-get install -y libssl1.0.0 libpcre3 --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
-ENV HAPROXY_MAJOR 1.6
-ENV HAPROXY_VERSION 1.6.10
-ENV HAPROXY_MD5 6d47461c008b823a0088d19ec30dbe4e
+ENV HAPROXY_MAJOR 1.7
+ENV HAPROXY_VERSION 1.7.0
+ENV HAPROXY_MD5 ab6e169aeb1b53364aacda80c904398a
 
 # see http://sources.debian.net/src/haproxy/1.5.8-1/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN buildDeps='curl gcc libc6-dev libpcre3-dev libssl-dev make' \

@TimWolla
Copy link
Copy Markdown
Contributor Author

Once this is merged you might consider dropping 1.4: haproxy 1.4 is in “critical fixes” maintenance only and IMO it is unlikely that people running Docker are running haproxy 1.4 when haproxy 1.5 has been released in 2014.

@tianon
Copy link
Copy Markdown
Member

tianon commented Nov 28, 2016

Nice, thanks! 👍

@tianon tianon merged commit c290cdf into docker-library:master Nov 28, 2016
@tianon
Copy link
Copy Markdown
Member

tianon commented Nov 28, 2016

I think we'll probably keep 1.4 until it's officially "Unmaintained" -- the maintenance burden isn't horribly high, and IMO there's still value there if upstream thinks it's worth still applying critical fixes to. 😇

@TimWolla TimWolla deleted the 1.7 branch November 28, 2016 18:29
tianon added a commit to infosiftr/stackbrew that referenced this pull request Nov 28, 2016
- `haproxy`: add 1.7 (docker-library/haproxy#35)
- `httpd`: add `mod_http2`, `mod_lua`, `mod_proxy_html`, and `mod_xml2enc` (docker-library/httpd#34)
- `mariadb`: add `file_env` support (MariaDB/mariadb-docker#89)
- `percona`: add `file_env` support (docker-library/percona#34); 5.6.34-79.1-1.jessie
- `piwik`: remove `ssmtp`
@TimWolla TimWolla mentioned this pull request Jan 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants