diff --git a/Dockerfile b/Dockerfile index 6bd257b..d35bbce 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER Dinko Korunic LABEL name="haproxytech/haproxy" \ vendor="HAProxy" \ - version="1.7.9" \ + version="1.8.3" \ release="1" \ url="https://www.haproxy.org" \ summary="HAProxy OpenSource" \ @@ -14,9 +14,9 @@ LABEL name="haproxytech/haproxy" \ io.openshift.expose-services="8080/tcp:http,8443/tcp:https" \ io.openshift.tags="http,https,proxy,loadbalancer" -ENV HAPROXY_BRANCH 1.7 -ENV HAPROXY_MINOR 1.7.9 -ENV HAPROXY_MD5 a2bbbdd45ffe18d99cdcf26aa992f92d +ENV HAPROXY_BRANCH 1.8 +ENV HAPROXY_MINOR 1.8.3 +ENV HAPROXY_MD5 2e1e3eb42f07983c9303c5622d812862 ENV HAPROXY_SRC_URL http://www.haproxy.org/download ENV HAPROXY_UID 10001 diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index fb253f3..690be5e 100755 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -3,7 +3,7 @@ MAINTAINER Dinko Korunic LABEL name="haproxytech/haproxy" \ vendor="HAProxy" \ - version="1.7.9" \ + version="1.8.3" \ release="1" \ url="https://www.haproxy.org" \ summary="HAProxy OpenSource" \ @@ -14,9 +14,9 @@ LABEL name="haproxytech/haproxy" \ io.openshift.expose-services="8080/tcp:http,8443/tcp:https" \ io.openshift.tags="http,https,proxy,loadbalancer" -ENV HAPROXY_BRANCH 1.7 -ENV HAPROXY_MINOR 1.7.9 -ENV HAPROXY_MD5 a2bbbdd45ffe18d99cdcf26aa992f92d +ENV HAPROXY_BRANCH 1.8 +ENV HAPROXY_MINOR 1.8.3 +ENV HAPROXY_MD5 2e1e3eb42f07983c9303c5622d812862 ENV HAPROXY_SRC_URL http://www.haproxy.org/download ENV HAPROXY_UID 10001 diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 index 6bccdfd..e1c020d --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CONTEXT = haproxytech -VERSION = 1.7.6 +VERSION = 1.8.3 IMAGE_NAME = openshift-haproxy TARGET = centos7 REGISTRY = docker-registry.default.svc.cluster.local @@ -48,4 +48,4 @@ run: docker run -tdi -u $(shell shuf -i 1000010000-1000020000 -n 1) -p 8080:8080 ${CONTEXT}/${IMAGE_NAME}:${TARGET}-${VERSION} clean: - rm -f build \ No newline at end of file + rm -f build diff --git a/update.sh b/update.sh index c6a5aeb..365c2c7 100755 --- a/update.sh +++ b/update.sh @@ -2,7 +2,7 @@ set -e DOCKERFILE=${1:-Dockerfile} -HAPROXY_BRANCH=1.7 +HAPROXY_BRANCH=1.8 HAPROXY_SRC_URL=http://www.haproxy.org/download HAPROXY_MINOR=$(curl -sfSL "$HAPROXY_SRC_URL/$HAPROXY_BRANCH/src/" | \