From a702a2a6362ad65e36571a2d64551c67b84733c6 Mon Sep 17 00:00:00 2001 From: Dinko Korunic Date: Wed, 29 May 2024 14:56:53 +0000 Subject: [PATCH] Automated commit triggered by 2.6.17 release(s) --- .github/workflows/docker_auto.yml | 2 +- .github/workflows/docker_manual.yml | 4 ++-- 2.6/Dockerfile | 9 ++++----- 2.6/haproxy.cfg | 2 +- 2.8/Dockerfile | 11 +++++------ 2.8/haproxy.cfg | 2 +- 2.9/Dockerfile | 11 +++++------ 2.9/haproxy.cfg | 2 +- 3.0/Dockerfile | 13 ++++++------- 3.0/haproxy.cfg | 2 +- {2.7 => 3.1}/Dockerfile | 19 +++++++++---------- {2.7 => 3.1}/docker-entrypoint.sh | 0 {2.7 => 3.1}/haproxy.cfg | 6 +++--- README.md | 4 ++-- README_short.md | 4 ++-- build.sh | 4 ++-- 16 files changed, 45 insertions(+), 50 deletions(-) rename {2.7 => 3.1}/Dockerfile (88%) rename {2.7 => 3.1}/docker-entrypoint.sh (100%) rename {2.7 => 3.1}/haproxy.cfg (92%) diff --git a/.github/workflows/docker_auto.yml b/.github/workflows/docker_auto.yml index 3d68600..4e337ba 100644 --- a/.github/workflows/docker_auto.yml +++ b/.github/workflows/docker_auto.yml @@ -13,7 +13,7 @@ jobs: env: DOCKER_PLATFORMS: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 DOCKER_IMAGE: haproxytech/haproxy-alpine-quic - STABLE_BRANCH: "2.9" + STABLE_BRANCH: "3.0" steps: - name: Login to Docker Hub id: login_docker diff --git a/.github/workflows/docker_manual.yml b/.github/workflows/docker_manual.yml index fcbbbf9..271b408 100644 --- a/.github/workflows/docker_manual.yml +++ b/.github/workflows/docker_manual.yml @@ -9,11 +9,11 @@ jobs: packages: write strategy: matrix: - branch: ["2.6", "2.7", "2.8", "2.9", "3.0"] + branch: ["2.6", "2.8", "2.9", "3.0", "3.1"] env: DOCKER_PLATFORMS: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 DOCKER_IMAGE: haproxytech/haproxy-alpine-quic - STABLE_BRANCH: "2.9" + STABLE_BRANCH: "3.0" steps: - name: Login to Docker Hub id: login_docker diff --git a/2.6/Dockerfile b/2.6/Dockerfile index 89be3cb..a0419cf 100644 --- a/2.6/Dockerfile +++ b/2.6/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine3.18 AS dataplaneapi-builder +FROM golang:alpine3.20 AS dataplaneapi-builder ENV DATAPLANE_MINOR 2.9.3 ENV DATAPLANE_URL https://github.com/haproxytech/dataplaneapi.git @@ -9,10 +9,9 @@ RUN apk add --no-cache ca-certificates git make && \ git checkout "v${DATAPLANE_MINOR}" && \ make build && cp build/dataplaneapi /dataplaneapi -FROM alpine:3.18 AS openssl-builder +FROM alpine:3.20 AS openssl-builder -ENV OPENSSL_SHA256 1651412ec136a693fcc84c77df664ca0dc0495eab2785afa2c7ba064a00fb1b6 -ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.4-quic1.tar.gz +ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.5-quic1.tar.gz RUN apk add --no-cache curl build-base make autoconf automake gcc libc-dev linux-headers && \ curl -sfSL "${OPENSSL_URL}" -o openssl.tar.gz && \ @@ -25,7 +24,7 @@ RUN apk add --no-cache curl build-base make autoconf automake gcc libc-dev linux make install && \ rm -rf /tmp/openssl -FROM alpine:3.18 +FROM alpine:3.20 MAINTAINER Dinko Korunic diff --git a/2.6/haproxy.cfg b/2.6/haproxy.cfg index 3eba416..2f78889 100644 --- a/2.6/haproxy.cfg +++ b/2.6/haproxy.cfg @@ -67,7 +67,7 @@ defaults # user admin insecure-password mypassword # # program api -# command /usr/bin/dataplaneapi --host 0.0.0.0 --port 5555 --haproxy-bin /usr/sbin/haproxy --config-file /etc/haproxy/haproxy.cfg --reload-cmd "kill -SIGUSR2 1" --restart-cmd "kill -SIGUSR2 1" --reload-delay 5 --userlist haproxy-dataplaneapi +# command /usr/bin/dataplaneapi --host 0.0.0.0 --port 5555 --haproxy-bin /usr/sbin/haproxy --config-file /usr/local/etc/haproxy/haproxy.cfg --reload-cmd "kill -SIGUSR2 1" --restart-cmd "kill -SIGUSR2 1" --reload-delay 5 --userlist haproxy-dataplaneapi # no option start-on-reload #--------------------------------------------------------------------- diff --git a/2.8/Dockerfile b/2.8/Dockerfile index ebf23c2..d714897 100644 --- a/2.8/Dockerfile +++ b/2.8/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine3.18 AS dataplaneapi-builder +FROM golang:alpine3.20 AS dataplaneapi-builder ENV DATAPLANE_MINOR 2.9.3 ENV DATAPLANE_URL https://github.com/haproxytech/dataplaneapi.git @@ -9,10 +9,9 @@ RUN apk add --no-cache ca-certificates git make && \ git checkout "v${DATAPLANE_MINOR}" && \ make build && cp build/dataplaneapi /dataplaneapi -FROM alpine:3.18 AS openssl-builder +FROM alpine:3.20 AS openssl-builder -ENV OPENSSL_SHA256 1651412ec136a693fcc84c77df664ca0dc0495eab2785afa2c7ba064a00fb1b6 -ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.4-quic1.tar.gz +ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.5-quic1.tar.gz RUN apk add --no-cache curl build-base make autoconf automake gcc libc-dev linux-headers && \ curl -sfSL "${OPENSSL_URL}" -o openssl.tar.gz && \ @@ -25,7 +24,7 @@ RUN apk add --no-cache curl build-base make autoconf automake gcc libc-dev linux make install && \ rm -rf /tmp/openssl -FROM alpine:3.18 +FROM alpine:3.20 MAINTAINER Dinko Korunic @@ -36,7 +35,7 @@ LABEL Version 2.8.9 LABEL RUN /usr/bin/docker -d IMAGE ENV HAPROXY_BRANCH 2.8 -ENV HAPROXY_MINOR 2.8.9 +ENV HAPROXY_MINOR 2.8.9-old ENV HAPROXY_SHA256 7a821478f36f847607f51a51e80f4f890c37af4811d60438e7f63783f67592ff ENV HAPROXY_SRC_URL http://www.haproxy.org/download diff --git a/2.8/haproxy.cfg b/2.8/haproxy.cfg index 1130714..b66c868 100644 --- a/2.8/haproxy.cfg +++ b/2.8/haproxy.cfg @@ -67,7 +67,7 @@ defaults # user admin insecure-password mypassword # # program api -# command /usr/bin/dataplaneapi --host 0.0.0.0 --port 5555 --haproxy-bin /usr/sbin/haproxy --config-file /etc/haproxy/haproxy.cfg --reload-cmd "kill -SIGUSR2 1" --restart-cmd "kill -SIGUSR2 1" --reload-delay 5 --userlist haproxy-dataplaneapi +# command /usr/bin/dataplaneapi --host 0.0.0.0 --port 5555 --haproxy-bin /usr/sbin/haproxy --config-file /usr/local/etc/haproxy/haproxy.cfg --reload-cmd "kill -SIGUSR2 1" --restart-cmd "kill -SIGUSR2 1" --reload-delay 5 --userlist haproxy-dataplaneapi # no option start-on-reload #--------------------------------------------------------------------- diff --git a/2.9/Dockerfile b/2.9/Dockerfile index 43efd87..d63f34a 100644 --- a/2.9/Dockerfile +++ b/2.9/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine3.18 AS dataplaneapi-builder +FROM golang:alpine3.20 AS dataplaneapi-builder ENV DATAPLANE_MINOR 2.9.3 ENV DATAPLANE_URL https://github.com/haproxytech/dataplaneapi.git @@ -9,10 +9,9 @@ RUN apk add --no-cache ca-certificates git make && \ git checkout "v${DATAPLANE_MINOR}" && \ make build && cp build/dataplaneapi /dataplaneapi -FROM alpine:3.18 AS openssl-builder +FROM alpine:3.20 AS openssl-builder -ENV OPENSSL_SHA256 1651412ec136a693fcc84c77df664ca0dc0495eab2785afa2c7ba064a00fb1b6 -ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.4-quic1.tar.gz +ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.5-quic1.tar.gz RUN apk add --no-cache curl build-base make autoconf automake gcc libc-dev linux-headers && \ curl -sfSL "${OPENSSL_URL}" -o openssl.tar.gz && \ @@ -25,7 +24,7 @@ RUN apk add --no-cache curl build-base make autoconf automake gcc libc-dev linux make install && \ rm -rf /tmp/openssl -FROM alpine:3.18 +FROM alpine:3.20 MAINTAINER Dinko Korunic @@ -36,7 +35,7 @@ LABEL Version 2.9.7 LABEL RUN /usr/bin/docker -d IMAGE ENV HAPROXY_BRANCH 2.9 -ENV HAPROXY_MINOR 2.9.7 +ENV HAPROXY_MINOR 2.9.7-old ENV HAPROXY_SHA256 d1a0a56f008a8d2f007bc0c37df6b2952520d1f4dde33b8d3802710e5158c131 ENV HAPROXY_SRC_URL http://www.haproxy.org/download diff --git a/2.9/haproxy.cfg b/2.9/haproxy.cfg index 92d98af..c5367a8 100644 --- a/2.9/haproxy.cfg +++ b/2.9/haproxy.cfg @@ -67,7 +67,7 @@ defaults # user admin insecure-password mypassword # # program api -# command /usr/bin/dataplaneapi --host 0.0.0.0 --port 5555 --haproxy-bin /usr/sbin/haproxy --config-file /etc/haproxy/haproxy.cfg --reload-cmd "kill -SIGUSR2 1" --restart-cmd "kill -SIGUSR2 1" --reload-delay 5 --userlist haproxy-dataplaneapi +# command /usr/bin/dataplaneapi --host 0.0.0.0 --port 5555 --haproxy-bin /usr/sbin/haproxy --config-file /usr/local/etc/haproxy/haproxy.cfg --reload-cmd "kill -SIGUSR2 1" --restart-cmd "kill -SIGUSR2 1" --reload-delay 5 --userlist haproxy-dataplaneapi # no option start-on-reload #--------------------------------------------------------------------- diff --git a/3.0/Dockerfile b/3.0/Dockerfile index de925e9..2bf051b 100644 --- a/3.0/Dockerfile +++ b/3.0/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine3.18 AS dataplaneapi-builder +FROM golang:alpine3.20 AS dataplaneapi-builder ENV DATAPLANE_MINOR 2.9.3 ENV DATAPLANE_URL https://github.com/haproxytech/dataplaneapi.git @@ -9,10 +9,9 @@ RUN apk add --no-cache ca-certificates git make && \ git checkout "v${DATAPLANE_MINOR}" && \ make build && cp build/dataplaneapi /dataplaneapi -FROM alpine:3.18 AS openssl-builder +FROM alpine:3.20 AS openssl-builder -ENV OPENSSL_SHA256 1651412ec136a693fcc84c77df664ca0dc0495eab2785afa2c7ba064a00fb1b6 -ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.4-quic1.tar.gz +ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.5-quic1.tar.gz RUN apk add --no-cache curl build-base make autoconf automake gcc libc-dev linux-headers && \ curl -sfSL "${OPENSSL_URL}" -o openssl.tar.gz && \ @@ -25,7 +24,7 @@ RUN apk add --no-cache curl build-base make autoconf automake gcc libc-dev linux make install && \ rm -rf /tmp/openssl -FROM alpine:3.18 +FROM alpine:3.20 MAINTAINER Dinko Korunic @@ -36,7 +35,7 @@ LABEL Version 3.0.0 LABEL RUN /usr/bin/docker -d IMAGE ENV HAPROXY_BRANCH 3.0 -ENV HAPROXY_MINOR 3.0.0 +ENV HAPROXY_MINOR 3.0.0-old ENV HAPROXY_SHA256 5aad97416216d2cd9dd212eb674839c40cd387f60fbc4b13d7ea3f1e5664a814 ENV HAPROXY_SRC_URL http://www.haproxy.org/download @@ -54,7 +53,7 @@ RUN apk add --no-cache ca-certificates && \ 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 && \ - curl -sfSL "${HAPROXY_SRC_URL}/${HAPROXY_BRANCH}/src/devel/haproxy-${HAPROXY_MINOR}.tar.gz" -o haproxy.tar.gz && \ + 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" && \ useradd -g "$HAPROXY_GID" "$HAPROXY_UID" && \ diff --git a/3.0/haproxy.cfg b/3.0/haproxy.cfg index 13bf186..86c9ef3 100644 --- a/3.0/haproxy.cfg +++ b/3.0/haproxy.cfg @@ -67,7 +67,7 @@ defaults # user admin insecure-password mypassword # # program api -# command /usr/bin/dataplaneapi --host 0.0.0.0 --port 5555 --haproxy-bin /usr/sbin/haproxy --config-file /etc/haproxy/haproxy.cfg --reload-cmd "kill -SIGUSR2 1" --restart-cmd "kill -SIGUSR2 1" --reload-delay 5 --userlist haproxy-dataplaneapi +# command /usr/bin/dataplaneapi --host 0.0.0.0 --port 5555 --haproxy-bin /usr/sbin/haproxy --config-file /usr/local/etc/haproxy/haproxy.cfg --reload-cmd "kill -SIGUSR2 1" --restart-cmd "kill -SIGUSR2 1" --reload-delay 5 --userlist haproxy-dataplaneapi # no option start-on-reload #--------------------------------------------------------------------- diff --git a/2.7/Dockerfile b/3.1/Dockerfile similarity index 88% rename from 2.7/Dockerfile rename to 3.1/Dockerfile index 825a7db..f8b1f69 100644 --- a/2.7/Dockerfile +++ b/3.1/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine3.18 AS dataplaneapi-builder +FROM golang:alpine3.20 AS dataplaneapi-builder ENV DATAPLANE_MINOR 2.9.3 ENV DATAPLANE_URL https://github.com/haproxytech/dataplaneapi.git @@ -9,10 +9,9 @@ RUN apk add --no-cache ca-certificates git make && \ git checkout "v${DATAPLANE_MINOR}" && \ make build && cp build/dataplaneapi /dataplaneapi -FROM alpine:3.18 AS openssl-builder +FROM alpine:3.20 AS openssl-builder -ENV OPENSSL_SHA256 1651412ec136a693fcc84c77df664ca0dc0495eab2785afa2c7ba064a00fb1b6 -ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.4-quic1.tar.gz +ENV OPENSSL_URL https://github.com/quictls/openssl/archive/refs/tags/openssl-3.1.5-quic1.tar.gz RUN apk add --no-cache curl build-base make autoconf automake gcc libc-dev linux-headers && \ curl -sfSL "${OPENSSL_URL}" -o openssl.tar.gz && \ @@ -25,19 +24,19 @@ RUN apk add --no-cache curl build-base make autoconf automake gcc libc-dev linux make install && \ rm -rf /tmp/openssl -FROM alpine:3.18 +FROM alpine:3.20 MAINTAINER Dinko Korunic LABEL Name HAProxy LABEL Release Community Edition LABEL Vendor HAProxy -LABEL Version 2.7.12 +LABEL Version 3.1.0 LABEL RUN /usr/bin/docker -d IMAGE -ENV HAPROXY_BRANCH 2.7 -ENV HAPROXY_MINOR 2.7.12 -ENV HAPROXY_SHA256 471d42524049b37b5fc79093ac26911a838c2c67a18bd2f8d01efd48a83a362c +ENV HAPROXY_BRANCH 3.1 +ENV HAPROXY_MINOR 3.1.0-old +ENV HAPROXY_SHA256 5aad97416216d2cd9dd212eb674839c40cd387f60fbc4b13d7ea3f1e5664a814 ENV HAPROXY_SRC_URL http://www.haproxy.org/download ENV DATAPLANE_MINOR 2.9.3 @@ -54,7 +53,7 @@ RUN apk add --no-cache ca-certificates && \ 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 && \ - curl -sfSL "${HAPROXY_SRC_URL}/${HAPROXY_BRANCH}/src/haproxy-${HAPROXY_MINOR}.tar.gz" -o haproxy.tar.gz && \ + 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" && \ useradd -g "$HAPROXY_GID" "$HAPROXY_UID" && \ diff --git a/2.7/docker-entrypoint.sh b/3.1/docker-entrypoint.sh similarity index 100% rename from 2.7/docker-entrypoint.sh rename to 3.1/docker-entrypoint.sh diff --git a/2.7/haproxy.cfg b/3.1/haproxy.cfg similarity index 92% rename from 2.7/haproxy.cfg rename to 3.1/haproxy.cfg index e456350..ea2bda0 100644 --- a/2.7/haproxy.cfg +++ b/3.1/haproxy.cfg @@ -2,8 +2,8 @@ # Example configuration for a possible web application. See the # full configuration options online. # -# https://www.haproxy.org/download/2.7/doc/configuration.txt -# https://cbonte.github.io/haproxy-dconv/2.7/configuration.html +# https://www.haproxy.org/download/3.1/doc/configuration.txt +# https://cbonte.github.io/haproxy-dconv/3.1/configuration.html # #--------------------------------------------------------------------- @@ -67,7 +67,7 @@ defaults # user admin insecure-password mypassword # # program api -# command /usr/bin/dataplaneapi --host 0.0.0.0 --port 5555 --haproxy-bin /usr/sbin/haproxy --config-file /etc/haproxy/haproxy.cfg --reload-cmd "kill -SIGUSR2 1" --restart-cmd "kill -SIGUSR2 1" --reload-delay 5 --userlist haproxy-dataplaneapi +# command /usr/bin/dataplaneapi --host 0.0.0.0 --port 5555 --haproxy-bin /usr/sbin/haproxy --config-file /usr/local/etc/haproxy/haproxy.cfg --reload-cmd "kill -SIGUSR2 1" --restart-cmd "kill -SIGUSR2 1" --reload-delay 5 --userlist haproxy-dataplaneapi # no option start-on-reload #--------------------------------------------------------------------- diff --git a/README.md b/README.md index 21bfcfa..b796c05 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ This image is being shipped with a trivial sample configuration and for any real ## Create a `Dockerfile` ```dockerfile -FROM haproxytech/haproxy-alpine-quic:2.7 +FROM haproxytech/haproxy-alpine-quic:3.0 COPY haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg ``` @@ -80,7 +80,7 @@ You will also need to publish the ports your HAProxy is listening on to the host ## Use volume for configuration persistency ```console -$ docker run -d --name my-running-haproxy -v /path/to/etc/haproxy:/usr/local/etc/haproxy:ro haproxytech/haproxy-alpine-quic:2.7 +$ docker run -d --name my-running-haproxy -v /path/to/etc/haproxy:/usr/local/etc/haproxy:ro haproxytech/haproxy-alpine-quic:3.0 ``` Note that your host's `/path/to/etc/haproxy` folder should be populated with a file named `haproxy.cfg` as well as any other accompanying files local to `/etc/haproxy`. diff --git a/README_short.md b/README_short.md index 6c44d59..559efc6 100644 --- a/README_short.md +++ b/README_short.md @@ -45,7 +45,7 @@ This image is being shipped with a trivial sample configuration and for any real ## Create a `Dockerfile` ```dockerfile -FROM haproxytech/haproxy-alpine-quic:2.7 +FROM haproxytech/haproxy-alpine-quic:3.0 COPY haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg ``` @@ -72,7 +72,7 @@ You will also need to publish the ports your HAProxy is listening on to the host ## Use volume for configuration persistency ```console -$ docker run -d --name my-running-haproxy -v /path/to/etc/haproxy:/usr/local/etc/haproxy:ro haproxytech/haproxy-alpine-quic:2.7 +$ docker run -d --name my-running-haproxy -v /path/to/etc/haproxy:/usr/local/etc/haproxy:ro haproxytech/haproxy-alpine-quic:3.0 ``` Note that your host's `/path/to/etc/haproxy` folder should be populated with a file named `haproxy.cfg` as well as any other accompanying files local to `/etc/haproxy`. diff --git a/build.sh b/build.sh index 2b341a9..fc01e62 100755 --- a/build.sh +++ b/build.sh @@ -2,8 +2,8 @@ DOCKER_TAG="haproxytech/haproxy-alpine-quic" HAPROXY_GITHUB_URL="https://github.com/haproxytech/haproxy-docker-alpine-quic/blob/main" -HAPROXY_BRANCHES="2.6 2.7 2.8 2.9 3.0" -HAPROXY_CURRENT_BRANCH="2.9" +HAPROXY_BRANCHES="2.6 2.8 2.9 3.0 3.1" +HAPROXY_CURRENT_BRANCH="3.0" PUSH="no" HAPROXY_UPDATED=""