Skip to content

Commit 34e9f03

Browse files
yosifkityosifkit
committed
Apply templates via update.sh
1 parent 6ace11b commit 34e9f03

File tree

8 files changed

+71
-106
lines changed

8 files changed

+71
-106
lines changed

‎1.5/Dockerfile

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,50 @@
1+
# vim:set ft=dockerfile:
12
FROM debian:jessie
23

3-
RUN apt-get update && apt-get install -y libssl1.0.0 libpcre3 --no-install-recommends && rm -rf /var/lib/apt/lists/*
4+
RUN apt-get update \
5+
&& apt-get install -y --no-install-recommends \
6+
libpcre3 \
7+
libssl1.0.0 \
8+
&& rm -rf /var/lib/apt/lists/*
49

510
ENV HAPROXY_MAJOR 1.5
611
ENV HAPROXY_VERSION 1.5.19
712
ENV HAPROXY_MD5 74d49316f00e1fd9859bcac84ab04b5c
813

9-
# see https://sources.debian.net/src/haproxy/1.5.8-1/debian/rules/ for some helpful navigation of the possible "make" arguments
10-
RUN buildDeps='ca-certificates curl gcc libc6-dev libpcre3-dev libssl-dev make' \
11-
&& set -x \
14+
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
15+
RUN set -x \
16+
\
17+
&& buildDeps=' \
18+
ca-certificates \
19+
gcc \
20+
libc6-dev \
21+
libpcre3-dev \
22+
libssl-dev \
23+
zlib1g-dev \
24+
make \
25+
wget \
26+
' \
1227
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
13-
&& curl -SL "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" -o haproxy.tar.gz \
14-
&& echo "${HAPROXY_MD5} haproxy.tar.gz" | md5sum -c \
28+
\
29+
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
30+
&& echo "$HAPROXY_MD5 *haproxy.tar.gz" | md5sum -c \
1531
&& mkdir -p /usr/src/haproxy \
1632
&& tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1 \
1733
&& rm haproxy.tar.gz \
18-
&& make -C /usr/src/haproxy \
34+
\
35+
&& makeOpts=' \
1936
TARGET=linux2628 \
20-
USE_PCRE=1 PCREDIR= \
2137
USE_OPENSSL=1 \
38+
USE_PCRE=1 PCREDIR= \
2239
USE_ZLIB=1 \
23-
all \
24-
install-bin \
40+
' \
41+
&& make -C /usr/src/haproxy -j "$(nproc)" all $makeOpts \
42+
&& make -C /usr/src/haproxy install-bin $makeOpts \
43+
\
2544
&& mkdir -p /usr/local/etc/haproxy \
2645
&& cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \
2746
&& rm -rf /usr/src/haproxy \
47+
\
2848
&& apt-get purge -y --auto-remove $buildDeps
2949

3050
COPY docker-entrypoint.sh /

‎1.5/alpine/Dockerfile

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,46 @@
1+
# vim:set ft=dockerfile:
12
FROM alpine:3.5
23

34
ENV HAPROXY_MAJOR 1.5
45
ENV HAPROXY_VERSION 1.5.19
56
ENV HAPROXY_MD5 74d49316f00e1fd9859bcac84ab04b5c
67

7-
# see https://sources.debian.net/src/haproxy/1.5.8-1/debian/rules/ for some helpful navigation of the possible "make" arguments
8+
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
89
RUN set -x \
10+
\
911
&& apk add --no-cache --virtual .build-deps \
1012
ca-certificates \
11-
curl \
1213
gcc \
1314
libc-dev \
1415
linux-headers \
1516
make \
17+
openssl \
1618
openssl-dev \
1719
pcre-dev \
20+
readline-dev \
21+
tar \
1822
zlib-dev \
19-
&& curl -SL "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" -o haproxy.tar.gz \
20-
&& echo "${HAPROXY_MD5} haproxy.tar.gz" | md5sum -c \
21-
&& mkdir -p /usr/src \
22-
&& tar -xzf haproxy.tar.gz -C /usr/src \
23-
&& mv "/usr/src/haproxy-$HAPROXY_VERSION" /usr/src/haproxy \
23+
\
24+
# install HAProxy
25+
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
26+
&& echo "$HAPROXY_MD5 *haproxy.tar.gz" | md5sum -c \
27+
&& mkdir -p /usr/src/haproxy \
28+
&& tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1 \
2429
&& rm haproxy.tar.gz \
25-
&& make -C /usr/src/haproxy \
30+
\
31+
&& makeOpts=' \
2632
TARGET=linux2628 \
27-
USE_PCRE=1 PCREDIR= \
2833
USE_OPENSSL=1 \
34+
USE_PCRE=1 PCREDIR= \
2935
USE_ZLIB=1 \
30-
all \
31-
install-bin \
36+
' \
37+
&& make -C /usr/src/haproxy -j "$(getconf _NPROCESSORS_ONLN)" all $makeOpts \
38+
&& make -C /usr/src/haproxy install-bin $makeOpts \
39+
\
3240
&& mkdir -p /usr/local/etc/haproxy \
3341
&& cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \
3442
&& rm -rf /usr/src/haproxy \
43+
\
3544
&& runDeps="$( \
3645
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
3746
| tr ',' '\n' \

‎1.6/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
FROM debian:jessie-backports
1+
# vim:set ft=dockerfile:
2+
FROM debian:stretch-slim
23

34
RUN apt-get update \
45
&& apt-get install -y --no-install-recommends \
56
liblua5.3-0 \
67
libpcre3 \
7-
libssl1.0.0 \
8+
libssl1.1 \
89
&& rm -rf /var/lib/apt/lists/*
910

1011
ENV HAPROXY_MAJOR 1.6
@@ -21,6 +22,7 @@ RUN set -x \
2122
liblua5.3-dev \
2223
libpcre3-dev \
2324
libssl-dev \
25+
zlib1g-dev \
2426
make \
2527
wget \
2628
' \

‎1.6/alpine/Dockerfile

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
FROM alpine:3.5
1+
# vim:set ft=dockerfile:
2+
FROM alpine:3.7
23

34
ENV HAPROXY_MAJOR 1.6
45
ENV HAPROXY_VERSION 1.6.14
56
ENV HAPROXY_MD5 5daf73eb70052e8ec66c40817f265202
67

7-
# https://www.lua.org/ftp/#source
8-
ENV LUA_VERSION=5.3.4 \
9-
LUA_SHA1=79790cfd40e09ba796b01a571d4d63b52b1cd950
10-
118
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
129
RUN set -x \
1310
\
@@ -16,6 +13,7 @@ RUN set -x \
1613
gcc \
1714
libc-dev \
1815
linux-headers \
16+
lua5.3-dev \
1917
make \
2018
openssl \
2119
openssl-dev \
@@ -24,24 +22,6 @@ RUN set -x \
2422
tar \
2523
zlib-dev \
2624
\
27-
# install Lua
28-
&& wget -O lua.tar.gz "https://www.lua.org/ftp/lua-$LUA_VERSION.tar.gz" \
29-
&& echo "$LUA_SHA1 *lua.tar.gz" | sha1sum -c \
30-
&& mkdir -p /usr/src/lua \
31-
&& tar -xzf lua.tar.gz -C /usr/src/lua --strip-components=1 \
32-
&& rm lua.tar.gz \
33-
&& make -C /usr/src/lua -j "$(getconf _NPROCESSORS_ONLN)" linux \
34-
&& make -C /usr/src/lua install \
35-
# put things we don't care about into a "trash" directory for purging
36-
INSTALL_BIN='/usr/src/lua/trash/bin' \
37-
INSTALL_CMOD='/usr/src/lua/trash/cmod' \
38-
INSTALL_LMOD='/usr/src/lua/trash/lmod' \
39-
INSTALL_MAN='/usr/src/lua/trash/man' \
40-
# ... and since it builds static by default, put those bits somewhere we can purge after we build haproxy
41-
INSTALL_INC='/usr/local/lua-install/inc' \
42-
INSTALL_LIB='/usr/local/lua-install/lib' \
43-
&& rm -rf /usr/src/lua \
44-
\
4525
# install HAProxy
4626
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
4727
&& echo "$HAPROXY_MD5 *haproxy.tar.gz" | md5sum -c \
@@ -51,17 +31,14 @@ RUN set -x \
5131
\
5232
&& makeOpts=' \
5333
TARGET=linux2628 \
54-
USE_LUA=1 LUA_INC=/usr/local/lua-install/inc LUA_LIB=/usr/local/lua-install/lib \
34+
USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \
5535
USE_OPENSSL=1 \
5636
USE_PCRE=1 PCREDIR= \
5737
USE_ZLIB=1 \
5838
' \
5939
&& make -C /usr/src/haproxy -j "$(getconf _NPROCESSORS_ONLN)" all $makeOpts \
6040
&& make -C /usr/src/haproxy install-bin $makeOpts \
6141
\
62-
# purge the remnants of our static Lua
63-
&& rm -rf /usr/local/lua-install \
64-
\
6542
&& mkdir -p /usr/local/etc/haproxy \
6643
&& cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \
6744
&& rm -rf /usr/src/haproxy \

‎1.7/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
FROM debian:jessie-backports
1+
# vim:set ft=dockerfile:
2+
FROM debian:stretch-slim
23

34
RUN apt-get update \
45
&& apt-get install -y --no-install-recommends \
56
liblua5.3-0 \
67
libpcre3 \
7-
libssl1.0.0 \
8+
libssl1.1 \
89
&& rm -rf /var/lib/apt/lists/*
910

1011
ENV HAPROXY_MAJOR 1.7
@@ -21,6 +22,7 @@ RUN set -x \
2122
liblua5.3-dev \
2223
libpcre3-dev \
2324
libssl-dev \
25+
zlib1g-dev \
2426
make \
2527
wget \
2628
' \

‎1.7/alpine/Dockerfile

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
FROM alpine:3.5
1+
# vim:set ft=dockerfile:
2+
FROM alpine:3.7
23

34
ENV HAPROXY_MAJOR 1.7
45
ENV HAPROXY_VERSION 1.7.10
56
ENV HAPROXY_MD5 a9b98a228660dee5ee65b62e3bd57822
67

7-
# https://www.lua.org/ftp/#source
8-
ENV LUA_VERSION=5.3.4 \
9-
LUA_SHA1=79790cfd40e09ba796b01a571d4d63b52b1cd950
10-
118
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
129
RUN set -x \
1310
\
@@ -16,6 +13,7 @@ RUN set -x \
1613
gcc \
1714
libc-dev \
1815
linux-headers \
16+
lua5.3-dev \
1917
make \
2018
openssl \
2119
openssl-dev \
@@ -24,24 +22,6 @@ RUN set -x \
2422
tar \
2523
zlib-dev \
2624
\
27-
# install Lua
28-
&& wget -O lua.tar.gz "https://www.lua.org/ftp/lua-$LUA_VERSION.tar.gz" \
29-
&& echo "$LUA_SHA1 *lua.tar.gz" | sha1sum -c \
30-
&& mkdir -p /usr/src/lua \
31-
&& tar -xzf lua.tar.gz -C /usr/src/lua --strip-components=1 \
32-
&& rm lua.tar.gz \
33-
&& make -C /usr/src/lua -j "$(getconf _NPROCESSORS_ONLN)" linux \
34-
&& make -C /usr/src/lua install \
35-
# put things we don't care about into a "trash" directory for purging
36-
INSTALL_BIN='/usr/src/lua/trash/bin' \
37-
INSTALL_CMOD='/usr/src/lua/trash/cmod' \
38-
INSTALL_LMOD='/usr/src/lua/trash/lmod' \
39-
INSTALL_MAN='/usr/src/lua/trash/man' \
40-
# ... and since it builds static by default, put those bits somewhere we can purge after we build haproxy
41-
INSTALL_INC='/usr/local/lua-install/inc' \
42-
INSTALL_LIB='/usr/local/lua-install/lib' \
43-
&& rm -rf /usr/src/lua \
44-
\
4525
# install HAProxy
4626
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
4727
&& echo "$HAPROXY_MD5 *haproxy.tar.gz" | md5sum -c \
@@ -51,17 +31,14 @@ RUN set -x \
5131
\
5232
&& makeOpts=' \
5333
TARGET=linux2628 \
54-
USE_LUA=1 LUA_INC=/usr/local/lua-install/inc LUA_LIB=/usr/local/lua-install/lib \
34+
USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \
5535
USE_OPENSSL=1 \
5636
USE_PCRE=1 PCREDIR= \
5737
USE_ZLIB=1 \
5838
' \
5939
&& make -C /usr/src/haproxy -j "$(getconf _NPROCESSORS_ONLN)" all $makeOpts \
6040
&& make -C /usr/src/haproxy install-bin $makeOpts \
6141
\
62-
# purge the remnants of our static Lua
63-
&& rm -rf /usr/local/lua-install \
64-
\
6542
&& mkdir -p /usr/local/etc/haproxy \
6643
&& cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \
6744
&& rm -rf /usr/src/haproxy \

‎1.8/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# vim:set ft=dockerfile:
12
FROM debian:stretch-slim
23

34
RUN apt-get update \

‎1.8/alpine/Dockerfile

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
FROM alpine:3.6
1+
# vim:set ft=dockerfile:
2+
FROM alpine:3.7
23

34
ENV HAPROXY_MAJOR 1.8
45
ENV HAPROXY_VERSION 1.8.6
56
ENV HAPROXY_MD5 5920cc244028fe23e182c4d7618e4077
67

7-
# https://www.lua.org/ftp/#source
8-
ENV LUA_VERSION=5.3.4 \
9-
LUA_SHA1=79790cfd40e09ba796b01a571d4d63b52b1cd950
10-
118
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
129
RUN set -x \
1310
\
@@ -16,6 +13,7 @@ RUN set -x \
1613
gcc \
1714
libc-dev \
1815
linux-headers \
16+
lua5.3-dev \
1917
make \
2018
openssl \
2119
openssl-dev \
@@ -24,24 +22,6 @@ RUN set -x \
2422
tar \
2523
zlib-dev \
2624
\
27-
# install Lua
28-
&& wget -O lua.tar.gz "https://www.lua.org/ftp/lua-$LUA_VERSION.tar.gz" \
29-
&& echo "$LUA_SHA1 *lua.tar.gz" | sha1sum -c \
30-
&& mkdir -p /usr/src/lua \
31-
&& tar -xzf lua.tar.gz -C /usr/src/lua --strip-components=1 \
32-
&& rm lua.tar.gz \
33-
&& make -C /usr/src/lua -j "$(getconf _NPROCESSORS_ONLN)" linux \
34-
&& make -C /usr/src/lua install \
35-
# put things we don't care about into a "trash" directory for purging
36-
INSTALL_BIN='/usr/src/lua/trash/bin' \
37-
INSTALL_CMOD='/usr/src/lua/trash/cmod' \
38-
INSTALL_LMOD='/usr/src/lua/trash/lmod' \
39-
INSTALL_MAN='/usr/src/lua/trash/man' \
40-
# ... and since it builds static by default, put those bits somewhere we can purge after we build haproxy
41-
INSTALL_INC='/usr/local/lua-install/inc' \
42-
INSTALL_LIB='/usr/local/lua-install/lib' \
43-
&& rm -rf /usr/src/lua \
44-
\
4525
# install HAProxy
4626
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
4727
&& echo "$HAPROXY_MD5 *haproxy.tar.gz" | md5sum -c \
@@ -51,17 +31,14 @@ RUN set -x \
5131
\
5232
&& makeOpts=' \
5333
TARGET=linux2628 \
54-
USE_LUA=1 LUA_INC=/usr/local/lua-install/inc LUA_LIB=/usr/local/lua-install/lib \
34+
USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \
5535
USE_OPENSSL=1 \
5636
USE_PCRE=1 PCREDIR= \
5737
USE_ZLIB=1 \
5838
' \
5939
&& make -C /usr/src/haproxy -j "$(getconf _NPROCESSORS_ONLN)" all $makeOpts \
6040
&& make -C /usr/src/haproxy install-bin $makeOpts \
6141
\
62-
# purge the remnants of our static Lua
63-
&& rm -rf /usr/local/lua-install \
64-
\
6542
&& mkdir -p /usr/local/etc/haproxy \
6643
&& cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \
6744
&& rm -rf /usr/src/haproxy \

0 commit comments

Comments
 (0)