From 5a0ce3b06b5876d55dc3850626a9bc5871ce3b9c Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Mon, 29 Feb 2016 13:26:18 -0300 Subject: [PATCH] Update haproxy image --- images/haproxy/Dockerfile | 8 +++++--- images/haproxy/Makefile | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/images/haproxy/Dockerfile b/images/haproxy/Dockerfile index d09bcad8e..f220cda96 100644 --- a/images/haproxy/Dockerfile +++ b/images/haproxy/Dockerfile @@ -13,11 +13,13 @@ # limitations under the License. -FROM alpine:edge +FROM gcr.io/google_containers/debian-slim:0.1 MAINTAINER Prashanth B -RUN apk add -U bash curl socat haproxy && \ - rm -rf /var/cache/apk/* +RUN apt-get update && apt-get install -y --no-install-recommends \ + bash curl socat haproxy ca-certificates && \ + apt-get clean -y && \ + rm -rf /var/lib/apt/lists/* RUN mkdir -p /etc/haproxy/errors /var/state/haproxy RUN for ERROR_CODE in 400 403 404 408 500 502 503 504;do curl -sSL -o /etc/haproxy/errors/$ERROR_CODE.http \ diff --git a/images/haproxy/Makefile b/images/haproxy/Makefile index 1e3361e15..01039f1d6 100644 --- a/images/haproxy/Makefile +++ b/images/haproxy/Makefile @@ -1,7 +1,7 @@ all: push # 0.0.0 shouldn't clobber any released builds -TAG = 0.2 +TAG = 0.0 PREFIX = gcr.io/google_containers/haproxy HAPROXY_IMAGE = haproxy