Skip to content

Commit d024934

Browse files
dkorunicdkorunic
committed
Remove 2.0 branch. Bring back dataplaneapi v2 as /usr/local/bin/dataplaneapi-v2
1 parent e2dee55 commit d024934

File tree

13 files changed

+68
-211
lines changed

13 files changed

+68
-211
lines changed

‎.github/workflows/docker_manual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
packages: write
1010
strategy:
1111
matrix:
12-
branch: ["2.0", "2.2", "2.4", "2.6", "2.8", "2.9", "3.0", "3.1"]
12+
branch: ["2.2", "2.4", "2.6", "2.8", "2.9", "3.0", "3.1"]
1313
env:
1414
DOCKER_PLATFORMS: linux/amd64,linux/arm/v7,linux/arm64
1515
DOCKER_IMAGE: haproxytech/haproxy-ubuntu

‎2.0/Dockerfile

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎2.0/docker-entrypoint.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎2.0/haproxy.cfg

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎2.2/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
FROM golang:alpine3.20 AS 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:focal
1317

@@ -34,6 +38,7 @@ ENV HAPROXY_GID haproxy
3438
ENV DEBIAN_FRONTEND noninteractive
3539

3640
COPY --from=builder /dataplaneapi /usr/local/bin/dataplaneapi
41+
COPY --from=builder /dataplaneapi-v2 /usr/local/bin/dataplaneapi-v2
3742

3843
RUN apt-get update && \
3944
apt-get install -y --no-install-recommends procps libssl1.1 zlib1g "libpcre2-*" liblua5.3-0 libatomic1 tar curl socat ca-certificates && \
@@ -70,6 +75,8 @@ RUN apt-get update && \
7075
rm -rf /var/lib/apt/lists/* && \
7176
chmod +x /usr/local/bin/dataplaneapi && \
7277
ln -s /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi && \
78+
chmod +x /usr/local/bin/dataplaneapi-v2 && \
79+
ln -s /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \
7380
touch /usr/local/etc/haproxy/dataplaneapi.yml && \
7481
chown "$HAPROXY_UID:$HAPROXY_GID" /usr/local/etc/haproxy/dataplaneapi.yml
7582

‎2.4/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
FROM golang:alpine3.20 AS 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:noble
1317

@@ -30,6 +34,7 @@ ENV HAPROXY_GID haproxy
3034
ENV DEBIAN_FRONTEND noninteractive
3135

3236
COPY --from=builder /dataplaneapi /usr/local/bin/dataplaneapi
37+
COPY --from=builder /dataplaneapi-v2 /usr/local/bin/dataplaneapi-v2
3338

3439
RUN apt-get update && \
3540
apt-get install -y --no-install-recommends procps libssl3t64 zlib1g "libpcre2-*" liblua5.4-0 libatomic1 tar curl socat ca-certificates libjemalloc2 && \
@@ -60,6 +65,8 @@ RUN apt-get update && \
6065
rm -rf /var/lib/apt/lists/* && \
6166
chmod +x /usr/local/bin/dataplaneapi && \
6267
ln -s /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi && \
68+
chmod +x /usr/local/bin/dataplaneapi-v2 && \
69+
ln -s /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \
6370
touch /usr/local/etc/haproxy/dataplaneapi.yml && \
6471
chown "$HAPROXY_UID:$HAPROXY_GID" /usr/local/etc/haproxy/dataplaneapi.yml
6572

‎2.6/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
FROM golang:alpine3.20 AS 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:noble
1317

@@ -30,6 +34,7 @@ ENV HAPROXY_GID haproxy
3034
ENV DEBIAN_FRONTEND noninteractive
3135

3236
COPY --from=builder /dataplaneapi /usr/local/bin/dataplaneapi
37+
COPY --from=builder /dataplaneapi-v2 /usr/local/bin/dataplaneapi-v2
3338

3439
RUN apt-get update && \
3540
apt-get install -y --no-install-recommends procps libssl3t64 zlib1g "libpcre2-*" liblua5.4-0 libatomic1 tar curl socat ca-certificates libjemalloc2 && \
@@ -60,6 +65,8 @@ RUN apt-get update && \
6065
rm -rf /var/lib/apt/lists/* && \
6166
chmod +x /usr/local/bin/dataplaneapi && \
6267
ln -s /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi && \
68+
chmod +x /usr/local/bin/dataplaneapi-v2 && \
69+
ln -s /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \
6370
touch /usr/local/etc/haproxy/dataplaneapi.yml && \
6471
chown "$HAPROXY_UID:$HAPROXY_GID" /usr/local/etc/haproxy/dataplaneapi.yml
6572

‎2.8/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
FROM golang:alpine3.20 AS 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:noble
1317

@@ -30,6 +34,7 @@ ENV HAPROXY_GID haproxy
3034
ENV DEBIAN_FRONTEND noninteractive
3135

3236
COPY --from=builder /dataplaneapi /usr/local/bin/dataplaneapi
37+
COPY --from=builder /dataplaneapi-v2 /usr/local/bin/dataplaneapi-v2
3338

3439
RUN apt-get update && \
3540
apt-get install -y --no-install-recommends procps libssl3t64 zlib1g "libpcre2-*" liblua5.4-0 libatomic1 tar curl socat ca-certificates libjemalloc2 && \
@@ -61,6 +66,8 @@ RUN apt-get update && \
6166
rm -rf /var/lib/apt/lists/* && \
6267
chmod +x /usr/local/bin/dataplaneapi && \
6368
ln -s /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi && \
69+
chmod +x /usr/local/bin/dataplaneapi-v2 && \
70+
ln -s /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \
6471
touch /usr/local/etc/haproxy/dataplaneapi.yml && \
6572
chown "$HAPROXY_UID:$HAPROXY_GID" /usr/local/etc/haproxy/dataplaneapi.yml
6673

‎2.9/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
FROM golang:alpine3.20 AS 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:noble
1317

@@ -30,6 +34,7 @@ ENV HAPROXY_GID haproxy
3034
ENV DEBIAN_FRONTEND noninteractive
3135

3236
COPY --from=builder /dataplaneapi /usr/local/bin/dataplaneapi
37+
COPY --from=builder /dataplaneapi-v2 /usr/local/bin/dataplaneapi-v2
3338

3439
RUN apt-get update && \
3540
apt-get install -y --no-install-recommends procps libssl3t64 zlib1g "libpcre2-*" liblua5.4-0 libatomic1 tar curl socat ca-certificates libjemalloc2 && \
@@ -61,6 +66,8 @@ RUN apt-get update && \
6166
rm -rf /var/lib/apt/lists/* && \
6267
chmod +x /usr/local/bin/dataplaneapi && \
6368
ln -s /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi && \
69+
chmod +x /usr/local/bin/dataplaneapi-v2 && \
70+
ln -s /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \
6471
touch /usr/local/etc/haproxy/dataplaneapi.yml && \
6572
chown "$HAPROXY_UID:$HAPROXY_GID" /usr/local/etc/haproxy/dataplaneapi.yml
6673

0 commit comments

Comments
 (0)