Skip to content

Commit 9883d12

Browse files
dkorunicdkorunic
committed
Remove 2.0 branch. Bring back dataplaneapi v2 as /usr/local/bin/dataplaneapi-v2. Update quictls to 3.1.7-quic1.
1 parent 4ccefa4 commit 9883d12

File tree

6 files changed

+54
-10
lines changed

6 files changed

+54
-10
lines changed

‎2.6/Dockerfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
FROM golang:alpine3.20 AS dataplaneapi-builder
22

33
ENV DATAPLANE_MINOR 3.0.0
4+
ENV DATAPLANE_V2_MINOR 2.9.6
45
ENV DATAPLANE_URL https://github.com/haproxytech/dataplaneapi.git
56

67
RUN apk add --no-cache ca-certificates git make && \
78
git clone "${DATAPLANE_URL}" "${GOPATH}/src/github.com/haproxytech/dataplaneapi" && \
89
cd "${GOPATH}/src/github.com/haproxytech/dataplaneapi" && \
910
git checkout "v${DATAPLANE_MINOR}" && \
10-
make build && cp build/dataplaneapi /dataplaneapi
11+
make build && cp build/dataplaneapi /dataplaneapi && \
12+
make clean && \
13+
git checkout "v${DATAPLANE_V2_MINOR}" && \
14+
make build && cp build/dataplaneapi /dataplaneapi-v2
1115

1216
FROM ubuntu:jammy AS openssl-builder
1317

14-
ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.5-quic1.tar.gz
18+
ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.7-quic1.tar.gz
1519

1620
ENV DEBIAN_FRONTEND noninteractive
1721

@@ -48,6 +52,7 @@ ENV HAPROXY_GID haproxy
4852
ENV DEBIAN_FRONTEND noninteractive
4953

5054
COPY --from=dataplaneapi-builder /dataplaneapi /usr/local/bin/dataplaneapi
55+
COPY --from=dataplaneapi-builder /dataplaneapi-v2 /usr/local/bin/dataplaneapi-v2
5156
COPY --from=openssl-builder /opt/quictls /opt/quictls
5257

5358
RUN apt-get update && \
@@ -80,6 +85,8 @@ RUN apt-get update && \
8085
rm -rf /var/lib/apt/lists/* && \
8186
chmod +x /usr/local/bin/dataplaneapi && \
8287
ln -s /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi && \
88+
chmod +x /usr/local/bin/dataplaneapi-v2 && \
89+
ln -s /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \
8390
touch /usr/local/etc/haproxy/dataplaneapi.yml && \
8491
chown "$HAPROXY_UID:$HAPROXY_GID" /usr/local/etc/haproxy/dataplaneapi.yml && \
8592
echo "/opt/quictls/lib" > /etc/ld.so.conf.d/quictls.conf && \

‎2.8/Dockerfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
FROM golang:alpine3.20 AS dataplaneapi-builder
22

33
ENV DATAPLANE_MINOR 3.0.0
4+
ENV DATAPLANE_V2_MINOR 2.9.6
45
ENV DATAPLANE_URL https://github.com/haproxytech/dataplaneapi.git
56

67
RUN apk add --no-cache ca-certificates git make && \
78
git clone "${DATAPLANE_URL}" "${GOPATH}/src/github.com/haproxytech/dataplaneapi" && \
89
cd "${GOPATH}/src/github.com/haproxytech/dataplaneapi" && \
910
git checkout "v${DATAPLANE_MINOR}" && \
10-
make build && cp build/dataplaneapi /dataplaneapi
11+
make build && cp build/dataplaneapi /dataplaneapi && \
12+
make clean && \
13+
git checkout "v${DATAPLANE_V2_MINOR}" && \
14+
make build && cp build/dataplaneapi /dataplaneapi-v2
1115

1216
FROM ubuntu:jammy AS openssl-builder
1317

14-
ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.5-quic1.tar.gz
18+
ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.7-quic1.tar.gz
1519

1620
ENV DEBIAN_FRONTEND noninteractive
1721

@@ -48,6 +52,7 @@ ENV HAPROXY_GID haproxy
4852
ENV DEBIAN_FRONTEND noninteractive
4953

5054
COPY --from=dataplaneapi-builder /dataplaneapi /usr/local/bin/dataplaneapi
55+
COPY --from=dataplaneapi-builder /dataplaneapi-v2 /usr/local/bin/dataplaneapi-v2
5156
COPY --from=openssl-builder /opt/quictls /opt/quictls
5257

5358
RUN apt-get update && \
@@ -80,6 +85,8 @@ RUN apt-get update && \
8085
rm -rf /var/lib/apt/lists/* && \
8186
chmod +x /usr/local/bin/dataplaneapi && \
8287
ln -s /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi && \
88+
chmod +x /usr/local/bin/dataplaneapi-v2 && \
89+
ln -s /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \
8390
touch /usr/local/etc/haproxy/dataplaneapi.yml && \
8491
chown "$HAPROXY_UID:$HAPROXY_GID" /usr/local/etc/haproxy/dataplaneapi.yml && \
8592
echo "/opt/quictls/lib" > /etc/ld.so.conf.d/quictls.conf && \

‎2.9/Dockerfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
FROM golang:alpine3.20 AS dataplaneapi-builder
22

33
ENV DATAPLANE_MINOR 3.0.0
4+
ENV DATAPLANE_V2_MINOR 2.9.6
45
ENV DATAPLANE_URL https://github.com/haproxytech/dataplaneapi.git
56

67
RUN apk add --no-cache ca-certificates git make && \
78
git clone "${DATAPLANE_URL}" "${GOPATH}/src/github.com/haproxytech/dataplaneapi" && \
89
cd "${GOPATH}/src/github.com/haproxytech/dataplaneapi" && \
910
git checkout "v${DATAPLANE_MINOR}" && \
10-
make build && cp build/dataplaneapi /dataplaneapi
11+
make build && cp build/dataplaneapi /dataplaneapi && \
12+
make clean && \
13+
git checkout "v${DATAPLANE_V2_MINOR}" && \
14+
make build && cp build/dataplaneapi /dataplaneapi-v2
1115

1216
FROM ubuntu:jammy AS openssl-builder
1317

14-
ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.5-quic1.tar.gz
18+
ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.7-quic1.tar.gz
1519

1620
ENV DEBIAN_FRONTEND noninteractive
1721

@@ -48,6 +52,7 @@ ENV HAPROXY_GID haproxy
4852
ENV DEBIAN_FRONTEND noninteractive
4953

5054
COPY --from=dataplaneapi-builder /dataplaneapi /usr/local/bin/dataplaneapi
55+
COPY --from=dataplaneapi-builder /dataplaneapi-v2 /usr/local/bin/dataplaneapi-v2
5156
COPY --from=openssl-builder /opt/quictls /opt/quictls
5257

5358
RUN apt-get update && \
@@ -80,6 +85,8 @@ RUN apt-get update && \
8085
rm -rf /var/lib/apt/lists/* && \
8186
chmod +x /usr/local/bin/dataplaneapi && \
8287
ln -s /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi && \
88+
chmod +x /usr/local/bin/dataplaneapi-v2 && \
89+
ln -s /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \
8390
touch /usr/local/etc/haproxy/dataplaneapi.yml && \
8491
chown "$HAPROXY_UID:$HAPROXY_GID" /usr/local/etc/haproxy/dataplaneapi.yml && \
8592
echo "/opt/quictls/lib" > /etc/ld.so.conf.d/quictls.conf && \

‎3.0/Dockerfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
FROM golang:alpine3.20 AS dataplaneapi-builder
22

33
ENV DATAPLANE_MINOR 3.0.0
4+
ENV DATAPLANE_V2_MINOR 2.9.6
45
ENV DATAPLANE_URL https://github.com/haproxytech/dataplaneapi.git
56

67
RUN apk add --no-cache ca-certificates git make && \
78
git clone "${DATAPLANE_URL}" "${GOPATH}/src/github.com/haproxytech/dataplaneapi" && \
89
cd "${GOPATH}/src/github.com/haproxytech/dataplaneapi" && \
910
git checkout "v${DATAPLANE_MINOR}" && \
10-
make build && cp build/dataplaneapi /dataplaneapi
11+
make build && cp build/dataplaneapi /dataplaneapi && \
12+
make clean && \
13+
git checkout "v${DATAPLANE_V2_MINOR}" && \
14+
make build && cp build/dataplaneapi /dataplaneapi-v2
1115

1216
FROM ubuntu:jammy AS openssl-builder
1317

14-
ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.5-quic1.tar.gz
18+
ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.7-quic1.tar.gz
1519

1620
ENV DEBIAN_FRONTEND noninteractive
1721

@@ -48,6 +52,7 @@ ENV HAPROXY_GID haproxy
4852
ENV DEBIAN_FRONTEND noninteractive
4953

5054
COPY --from=dataplaneapi-builder /dataplaneapi /usr/local/bin/dataplaneapi
55+
COPY --from=dataplaneapi-builder /dataplaneapi-v2 /usr/local/bin/dataplaneapi-v2
5156
COPY --from=openssl-builder /opt/quictls /opt/quictls
5257

5358
RUN apt-get update && \
@@ -80,6 +85,8 @@ RUN apt-get update && \
8085
rm -rf /var/lib/apt/lists/* && \
8186
chmod +x /usr/local/bin/dataplaneapi && \
8287
ln -s /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi && \
88+
chmod +x /usr/local/bin/dataplaneapi-v2 && \
89+
ln -s /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \
8390
touch /usr/local/etc/haproxy/dataplaneapi.yml && \
8491
chown "$HAPROXY_UID:$HAPROXY_GID" /usr/local/etc/haproxy/dataplaneapi.yml && \
8592
echo "/opt/quictls/lib" > /etc/ld.so.conf.d/quictls.conf && \

‎3.1/Dockerfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
FROM golang:alpine3.20 AS dataplaneapi-builder
22

33
ENV DATAPLANE_MINOR 3.0.0
4+
ENV DATAPLANE_V2_MINOR 2.9.6
45
ENV DATAPLANE_URL https://github.com/haproxytech/dataplaneapi.git
56

67
RUN apk add --no-cache ca-certificates git make && \
78
git clone "${DATAPLANE_URL}" "${GOPATH}/src/github.com/haproxytech/dataplaneapi" && \
89
cd "${GOPATH}/src/github.com/haproxytech/dataplaneapi" && \
910
git checkout "v${DATAPLANE_MINOR}" && \
10-
make build && cp build/dataplaneapi /dataplaneapi
11+
make build && cp build/dataplaneapi /dataplaneapi && \
12+
make clean && \
13+
git checkout "v${DATAPLANE_V2_MINOR}" && \
14+
make build && cp build/dataplaneapi /dataplaneapi-v2
1115

1216
FROM ubuntu:jammy AS openssl-builder
1317

14-
ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.5-quic1.tar.gz
18+
ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.7-quic1.tar.gz
1519

1620
ENV DEBIAN_FRONTEND noninteractive
1721

@@ -48,6 +52,7 @@ ENV HAPROXY_GID haproxy
4852
ENV DEBIAN_FRONTEND noninteractive
4953

5054
COPY --from=dataplaneapi-builder /dataplaneapi /usr/local/bin/dataplaneapi
55+
COPY --from=dataplaneapi-builder /dataplaneapi-v2 /usr/local/bin/dataplaneapi-v2
5156
COPY --from=openssl-builder /opt/quictls /opt/quictls
5257

5358
RUN apt-get update && \
@@ -80,6 +85,8 @@ RUN apt-get update && \
8085
rm -rf /var/lib/apt/lists/* && \
8186
chmod +x /usr/local/bin/dataplaneapi && \
8287
ln -s /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi && \
88+
chmod +x /usr/local/bin/dataplaneapi-v2 && \
89+
ln -s /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \
8390
touch /usr/local/etc/haproxy/dataplaneapi.yml && \
8491
chown "$HAPROXY_UID:$HAPROXY_GID" /usr/local/etc/haproxy/dataplaneapi.yml && \
8592
echo "/opt/quictls/lib" > /etc/ld.so.conf.d/quictls.conf && \

‎update.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ if [ -z "${DATAPLANE_MINOR}" ]; then
5656
exit 1
5757
fi
5858

59+
DATAPLANE_SRC_URL="https://api.github.com/repos/haproxytech/dataplaneapi/releases"
60+
DATAPLANE_V2_MINOR=$(curl -sfSL "$DATAPLANE_SRC_URL" | \
61+
grep '"tag_name":.*"v2' | \
62+
sed -E 's/.*"v?([^"]+)".*/\1/' | \
63+
sort -V | \
64+
tail -1
65+
)
66+
5967
OPENSSL_SRC_URL="https://api.github.com/repos/quictls/openssl/releases"
6068
OPENSSL_MINOR=$(curl -sfSL "$OPENSSL_SRC_URL" | \
6169
grep '"tag_name":' | \
@@ -74,5 +82,6 @@ sed -r -i -e "s!^(ENV HAPROXY_SRC_URL) .*!\1 ${HAPROXY_SRC_URL}!;
7482
s!^(LABEL Version) .*!\1 ${HAPROXY_MINOR}!;
7583
s!^(ENV HAPROXY_SHA256) .*!\1 ${HAPROXY_SHA256}!
7684
s!^(ENV DATAPLANE_MINOR) .*!\1 ${DATAPLANE_MINOR}!
85+
s!^(ENV DATAPLANE_V2_MINOR) .*!\1 ${DATAPLANE_V2_MINOR}!
7786
s!^(ENV OPENSSL_MINOR) .*!\1 ${OPENSSL_MINOR}!" \
7887
"$DOCKERFILE"

0 commit comments

Comments
 (0)