From 88fddd524fdd36baf040fa686a2c02a49be88d43 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 16 Mar 2016 09:40:48 -0700 Subject: [PATCH] Move a couple minor things around for a slightly simpler diff --- 1.6/alpine/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/1.6/alpine/Dockerfile b/1.6/alpine/Dockerfile index 46dc45f..2fcfcc4 100644 --- a/1.6/alpine/Dockerfile +++ b/1.6/alpine/Dockerfile @@ -19,8 +19,9 @@ RUN set -x \ && echo "${HAPROXY_MD5} haproxy.tar.gz" | md5sum -c \ && mkdir -p /usr/src \ && tar -xzf haproxy.tar.gz -C /usr/src \ + && mv "/usr/src/haproxy-$HAPROXY_VERSION" /usr/src/haproxy \ && rm haproxy.tar.gz \ - && make -C /usr/src/haproxy-$HAPROXY_VERSION \ + && make -C /usr/src/haproxy \ TARGET=linux2628 \ USE_PCRE=1 PCREDIR= \ USE_OPENSSL=1 \ @@ -28,8 +29,8 @@ RUN set -x \ all \ install-bin \ && mkdir -p /usr/local/etc/haproxy \ - && cp -R /usr/src/haproxy-$HAPROXY_VERSION/examples/errorfiles \ - /usr/local/etc/haproxy/errors \ + && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ + && rm -rf /usr/src/haproxy \ && runDeps="$( \ scanelf --needed --nobanner --recursive /usr/local \ | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ @@ -38,7 +39,6 @@ RUN set -x \ | sort -u \ )" \ && apk add --virtual .haproxy-rundeps $runDeps \ - && apk del .build-deps \ - && rm -rf /usr/src/haproxy-$HAPROXY_VERSION + && apk del .build-deps CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"]