Skip to content

Commit

Permalink
Add jemalloc to 2.4-2.9 images. Enable QUIC COMPAT for 2.8.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkorunic
dkorunic committed Nov 2, 2023
1 parent dcff25b commit 43fadf2
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 18 deletions.
7 changes: 4 additions & 3 deletions 2.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LABEL Version 2.4.24
LABEL RUN /usr/bin/docker -d IMAGE

ENV HAPROXY_BRANCH 2.4
ENV HAPROXY_MINOR 2.4.24
ENV HAPROXY_MINOR 2.4.24-old
ENV HAPROXY_SHA256 decc925111980792f32ecb8778b1105d7d4594880c75d4d973fc85214ad6a953
ENV HAPROXY_SRC_URL http://www.haproxy.org/download

Expand All @@ -28,10 +28,10 @@ ENV HAPROXY_GID haproxy

COPY --from=builder /dataplaneapi /usr/local/bin/dataplaneapi

RUN apk add --no-cache ca-certificates && \
RUN apk add --no-cache ca-certificates jemalloc && \
apk add --no-cache --virtual build-deps gcc libc-dev \
linux-headers lua5.4-dev make openssl openssl-dev pcre2-dev tar \
zlib-dev curl shadow && \
zlib-dev curl shadow jemalloc-dev && \
curl -sfSL "${HAPROXY_SRC_URL}/${HAPROXY_BRANCH}/src/haproxy-${HAPROXY_MINOR}.tar.gz" -o haproxy.tar.gz && \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c - && \
groupadd "$HAPROXY_GID" && \
Expand All @@ -44,6 +44,7 @@ RUN apk add --no-cache ca-certificates && \
USE_LUA=1 LUA_LIB=/usr/lib/lua5.4 LUA_INC=/usr/include/lua5.4 \
USE_PROMEX=1 USE_SLZ=1 \
USE_OPENSSL=1 USE_PTHREAD_EMULATION=1 \
ADDLIB=-ljemalloc \
all && \
make -C /tmp/haproxy TARGET=linux2628 install-bin install-man && \
ln -s /usr/local/sbin/haproxy /usr/sbin/haproxy && \
Expand Down
7 changes: 4 additions & 3 deletions 2.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LABEL Version 2.5.14
LABEL RUN /usr/bin/docker -d IMAGE

ENV HAPROXY_BRANCH 2.5
ENV HAPROXY_MINOR 2.5.14
ENV HAPROXY_MINOR 2.5.14-old
ENV HAPROXY_SHA256 a0a44945687de3778a5c389f64fbede7be82f1ff2645eb1cc098822af8f4652a
ENV HAPROXY_SRC_URL http://www.haproxy.org/download

Expand All @@ -32,10 +32,10 @@ ENV HAPROXY_GID haproxy

COPY --from=builder /dataplaneapi /usr/local/bin/dataplaneapi

RUN apk add --no-cache ca-certificates && \
RUN apk add --no-cache ca-certificates jemalloc && \
apk add --no-cache --virtual build-deps gcc libc-dev \
linux-headers lua5.4-dev make openssl openssl-dev pcre2-dev tar \
zlib-dev curl shadow && \
zlib-dev curl shadow jemalloc-dev && \
curl -sfSL "${HAPROXY_SRC_URL}/${HAPROXY_BRANCH}/src/haproxy-${HAPROXY_MINOR}.tar.gz" -o haproxy.tar.gz && \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c - && \
groupadd "$HAPROXY_GID" && \
Expand All @@ -48,6 +48,7 @@ RUN apk add --no-cache ca-certificates && \
USE_LUA=1 LUA_LIB=/usr/lib/lua5.4 LUA_INC=/usr/include/lua5.4 \
USE_PROMEX=1 USE_SLZ=1 \
USE_OPENSSL=1 USE_PTHREAD_EMULATION=1 \
ADDLIB=-ljemalloc \
all && \
make -C /tmp/haproxy TARGET=linux2628 install-bin install-man && \
ln -s /usr/local/sbin/haproxy /usr/sbin/haproxy && \
Expand Down
7 changes: 4 additions & 3 deletions 2.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LABEL Version 2.6.15
LABEL RUN /usr/bin/docker -d IMAGE

ENV HAPROXY_BRANCH 2.6
ENV HAPROXY_MINOR 2.6.15
ENV HAPROXY_MINOR 2.6.15-old
ENV HAPROXY_SHA256 41f8e1695e92fafdffe39690a68993f1a0f5f7f06931a99e9a153f749ea39cfd
ENV HAPROXY_SRC_URL http://www.haproxy.org/download

Expand All @@ -32,10 +32,10 @@ ENV HAPROXY_GID haproxy

COPY --from=builder /dataplaneapi /usr/local/bin/dataplaneapi

RUN apk add --no-cache ca-certificates && \
RUN apk add --no-cache ca-certificates jemalloc && \
apk add --no-cache --virtual build-deps gcc libc-dev \
linux-headers lua5.4-dev make openssl openssl-dev pcre2-dev tar \
zlib-dev curl shadow && \
zlib-dev curl shadow jemalloc-dev && \
curl -sfSL "${HAPROXY_SRC_URL}/${HAPROXY_BRANCH}/src/haproxy-${HAPROXY_MINOR}.tar.gz" -o haproxy.tar.gz && \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c - && \
groupadd "$HAPROXY_GID" && \
Expand All @@ -48,6 +48,7 @@ RUN apk add --no-cache ca-certificates && \
USE_LUA=1 LUA_LIB=/usr/lib/lua5.4 LUA_INC=/usr/include/lua5.4 \
USE_PROMEX=1 USE_SLZ=1 \
USE_OPENSSL=1 USE_PTHREAD_EMULATION=1 \
ADDLIB=-ljemalloc \
all && \
make -C /tmp/haproxy TARGET=linux2628 install-bin install-man && \
ln -s /usr/local/sbin/haproxy /usr/sbin/haproxy && \
Expand Down
7 changes: 4 additions & 3 deletions 2.7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LABEL Version 2.7.10
LABEL RUN /usr/bin/docker -d IMAGE

ENV HAPROXY_BRANCH 2.7
ENV HAPROXY_MINOR 2.7.10
ENV HAPROXY_MINOR 2.7.10-old
ENV HAPROXY_SHA256 be175dcc1f6ad7ea174262493839bf2e632a3dd7df137dcca4ab882ae00c7490
ENV HAPROXY_SRC_URL http://www.haproxy.org/download

Expand All @@ -32,10 +32,10 @@ ENV HAPROXY_GID haproxy

COPY --from=builder /dataplaneapi /usr/local/bin/dataplaneapi

RUN apk add --no-cache ca-certificates && \
RUN apk add --no-cache ca-certificates jemalloc && \
apk add --no-cache --virtual build-deps gcc libc-dev \
linux-headers lua5.4-dev make openssl openssl-dev pcre2-dev tar \
zlib-dev curl shadow && \
zlib-dev curl shadow jemalloc-dev && \
curl -sfSL "${HAPROXY_SRC_URL}/${HAPROXY_BRANCH}/src/haproxy-${HAPROXY_MINOR}.tar.gz" -o haproxy.tar.gz && \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c - && \
groupadd "$HAPROXY_GID" && \
Expand All @@ -48,6 +48,7 @@ RUN apk add --no-cache ca-certificates && \
USE_LUA=1 LUA_LIB=/usr/lib/lua5.4 LUA_INC=/usr/include/lua5.4 \
USE_PROMEX=1 USE_SLZ=1 \
USE_OPENSSL=1 USE_PTHREAD_EMULATION=1 \
ADDLIB=-ljemalloc \
all && \
make -C /tmp/haproxy TARGET=linux2628 install-bin install-man && \
ln -s /usr/local/sbin/haproxy /usr/sbin/haproxy && \
Expand Down
8 changes: 5 additions & 3 deletions 2.8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LABEL Version 2.8.3
LABEL RUN /usr/bin/docker -d IMAGE

ENV HAPROXY_BRANCH 2.8
ENV HAPROXY_MINOR 2.8.3
ENV HAPROXY_MINOR 2.8.3-old
ENV HAPROXY_SHA256 9ecc6ffe67a977d1ed279107bbdab790d73ae2a626bc38eee23fa1f6786a759e
ENV HAPROXY_SRC_URL http://www.haproxy.org/download

Expand All @@ -32,10 +32,10 @@ ENV HAPROXY_GID haproxy

COPY --from=builder /dataplaneapi /usr/local/bin/dataplaneapi

RUN apk add --no-cache ca-certificates && \
RUN apk add --no-cache ca-certificates jemalloc && \
apk add --no-cache --virtual build-deps gcc libc-dev \
linux-headers lua5.4-dev make openssl openssl-dev pcre2-dev tar \
zlib-dev curl shadow && \
zlib-dev curl shadow jemalloc-dev && \
curl -sfSL "${HAPROXY_SRC_URL}/${HAPROXY_BRANCH}/src/haproxy-${HAPROXY_MINOR}.tar.gz" -o haproxy.tar.gz && \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c - && \
groupadd "$HAPROXY_GID" && \
Expand All @@ -48,6 +48,8 @@ RUN apk add --no-cache ca-certificates && \
USE_LUA=1 LUA_LIB=/usr/lib/lua5.4 LUA_INC=/usr/include/lua5.4 \
USE_PROMEX=1 USE_SLZ=1 \
USE_OPENSSL=1 USE_PTHREAD_EMULATION=1 \
USE_QUIC=1 USE_QUIC_OPENSSL_COMPAT=1 \
ADDLIB=-ljemalloc \
all && \
make -C /tmp/haproxy TARGET=linux2628 install-bin install-man && \
ln -s /usr/local/sbin/haproxy /usr/sbin/haproxy && \
Expand Down
7 changes: 4 additions & 3 deletions 2.9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LABEL Version 2.9-dev8
LABEL RUN /usr/bin/docker -d IMAGE

ENV HAPROXY_BRANCH 2.9
ENV HAPROXY_MINOR 2.9-dev8
ENV HAPROXY_MINOR 2.9-devold
ENV HAPROXY_SHA256 4cb71352d92d863f7b79c702ca0abaad37541d54b8ab79fd8ec9d8ade16d131b
ENV HAPROXY_SRC_URL http://www.haproxy.org/download

Expand All @@ -32,10 +32,10 @@ ENV HAPROXY_GID haproxy

COPY --from=builder /dataplaneapi /usr/local/bin/dataplaneapi

RUN apk add --no-cache ca-certificates && \
RUN apk add --no-cache ca-certificates jemalloc && \
apk add --no-cache --virtual build-deps gcc libc-dev \
linux-headers lua5.4-dev make openssl openssl-dev pcre2-dev tar \
zlib-dev curl shadow && \
zlib-dev curl shadow jemalloc-dev && \
curl -sfSL "${HAPROXY_SRC_URL}/${HAPROXY_BRANCH}/src/devel/haproxy-${HAPROXY_MINOR}.tar.gz" -o haproxy.tar.gz && \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c - && \
groupadd "$HAPROXY_GID" && \
Expand All @@ -49,6 +49,7 @@ RUN apk add --no-cache ca-certificates && \
USE_PROMEX=1 USE_SLZ=1 \
USE_OPENSSL=1 USE_PTHREAD_EMULATION=1 \
USE_QUIC=1 USE_QUIC_OPENSSL_COMPAT=1 \
ADDLIB=-ljemalloc \
all && \
make -C /tmp/haproxy TARGET=linux2628 install-bin install-man && \
ln -s /usr/local/sbin/haproxy /usr/sbin/haproxy && \
Expand Down

0 comments on commit 43fadf2

Please sign in to comment.