From c2cf8a6c5b9dfcb0008cf5546fc86d89fc1d633e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Sun, 26 Nov 2017 21:42:18 +0100 Subject: [PATCH] Add haproxy 1.8 --- .travis.yml | 6 +++--- {1.8-rc => 1.8}/Dockerfile | 4 ++-- {1.8-rc => 1.8}/alpine/Dockerfile | 4 ++-- {1.8-rc => 1.8}/alpine/docker-entrypoint.sh | 0 {1.8-rc => 1.8}/docker-entrypoint.sh | 0 5 files changed, 7 insertions(+), 7 deletions(-) rename {1.8-rc => 1.8}/Dockerfile (94%) rename {1.8-rc => 1.8}/alpine/Dockerfile (97%) rename {1.8-rc => 1.8}/alpine/docker-entrypoint.sh (100%) rename {1.8-rc => 1.8}/docker-entrypoint.sh (100%) diff --git a/.travis.yml b/.travis.yml index a984f9d..71affe3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ language: bash services: docker env: - - VERSION=1.8-rc VARIANT= - - VERSION=1.8-rc ARCH=i386 - - VERSION=1.8-rc VARIANT=alpine + - VERSION=1.8 VARIANT= + - VERSION=1.8 ARCH=i386 + - VERSION=1.8 VARIANT=alpine - VERSION=1.7 VARIANT= - VERSION=1.7 ARCH=i386 - VERSION=1.7 VARIANT=alpine diff --git a/1.8-rc/Dockerfile b/1.8/Dockerfile similarity index 94% rename from 1.8-rc/Dockerfile rename to 1.8/Dockerfile index df19d8e..1002917 100644 --- a/1.8-rc/Dockerfile +++ b/1.8/Dockerfile @@ -8,8 +8,8 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* ENV HAPROXY_MAJOR 1.8 -ENV HAPROXY_VERSION 1.8-rc4 -ENV HAPROXY_MD5 9bf5e689ceda1e5c8ec137042b2b1549 +ENV HAPROXY_VERSION 1.8.0 +ENV HAPROXY_MD5 6ccea4619b7183fbcc8c98bae1f9823d # see http://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments RUN set -x \ diff --git a/1.8-rc/alpine/Dockerfile b/1.8/alpine/Dockerfile similarity index 97% rename from 1.8-rc/alpine/Dockerfile rename to 1.8/alpine/Dockerfile index e8ef000..f799b86 100644 --- a/1.8-rc/alpine/Dockerfile +++ b/1.8/alpine/Dockerfile @@ -1,8 +1,8 @@ FROM alpine:3.6 ENV HAPROXY_MAJOR 1.8 -ENV HAPROXY_VERSION 1.8-rc4 -ENV HAPROXY_MD5 9bf5e689ceda1e5c8ec137042b2b1549 +ENV HAPROXY_VERSION 1.8.0 +ENV HAPROXY_MD5 6ccea4619b7183fbcc8c98bae1f9823d # https://www.lua.org/ftp/#source ENV LUA_VERSION=5.3.4 \ diff --git a/1.8-rc/alpine/docker-entrypoint.sh b/1.8/alpine/docker-entrypoint.sh similarity index 100% rename from 1.8-rc/alpine/docker-entrypoint.sh rename to 1.8/alpine/docker-entrypoint.sh diff --git a/1.8-rc/docker-entrypoint.sh b/1.8/docker-entrypoint.sh similarity index 100% rename from 1.8-rc/docker-entrypoint.sh rename to 1.8/docker-entrypoint.sh