20240617095020

cbdb-project · Jun 17, 2024 · e111ebc · e111ebc
1 parent b795d9a
commit e111ebc
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 165 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/README.md b/README.md
diff --git a/haproxy_alpine_builder.Dockerfile b/haproxy_alpine_builder.Dockerfile
@@ -1,8 +1,8 @@
 FROM quay.io/oopus/builder_image_x86_64-linux:alpine AS step1_lua54
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ## curl -sSL "https://www.lua.org/download.html" | tr -d '\r\n\t' | grep -Po '(?<=lua-)[0-9]\.[0-9]\.[0-9](?=\.tar\.gz)' | sort -Vr | head -n 1
-ARG lua_version='5.4.4'
-ARG image_build_date='2022-03-08'
+ARG lua_version=5.4.6
+ARG image_build_date=2024-06-17
 ARG dockerfile_workdir=/build_root/lua
 WORKDIR $dockerfile_workdir
 RUN curl -sS "https://www.lua.org/ftp/lua-${lua_version}.tar.gz" | bsdtar -xf- --strip-components 1 --no-xattrs \
@@ -13,9 +13,9 @@ RUN curl -sS "https://www.lua.org/ftp/lua-${lua_version}.tar.gz" | bsdtar -xf- -
 
 FROM step1_lua54 AS haproxy_builder
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-ARG haproxy_branch='2.4'
+ARG haproxy_branch=2.4
 ## curl -sSL "https://git.haproxy.org/?p=haproxy-${haproxy_branch}.git;a=commit;h=refs/heads/master" | tr -d '\r\n\t' | grep -Po '(?<=<td>commit<\/td><td class="sha1">)[a-zA-Z0-9]+(?=<\/td>)'
-ARG haproxy_latest_commit_hash='12460dbc67dedd1fef9dc81f59ee8154d9f6198f'
+ARG haproxy_latest_commit_hash=b9eb201aee22b2bf90e56efdc58cf7a1681d7315
 ARG dockerfile_workdir=/build_root/haproxy
 WORKDIR $dockerfile_workdir
 RUN curl -fsSL "https://git.haproxy.org/?p=haproxy-${haproxy_branch}.git;a=snapshot;h=${haproxy_latest_commit_hash};sf=tgz" | bsdtar -xf- --strip-components 1 --no-xattrs \

diff --git a/haproxy_debian_builder.Dockerfile b/haproxy_debian_builder.Dockerfile
@@ -1,8 +1,8 @@
 FROM quay.io/oopus/builder_image_x86_64-linux:debian-oldstable AS step1_lua54
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ## curl -sSL "https://www.lua.org/download.html" | tr -d '\r\n\t' | grep -Po '(?<=lua-)[0-9]\.[0-9]\.[0-9](?=\.tar\.gz)' | sort -Vr | head -n 1
-ARG lua_version='5.4.4'
-ARG image_build_date='2022-03-08'
+ARG lua_version=5.4.6
+ARG image_build_date=2024-06-17
 ARG dockerfile_workdir=/build_root/lua
 WORKDIR $dockerfile_workdir
 RUN curl --retry 5 --retry-delay 10 --retry-max-time 60 -fsSL "https://www.lua.org/ftp/lua-${lua_version}.tar.gz" | bsdtar -xf- --strip-components 1 --no-xattrs \
@@ -16,9 +16,9 @@ RUN curl --retry 5 --retry-delay 10 --retry-max-time 60 -fsSL "https://www.lua.o
 FROM step1_lua54 AS step3_jemalloc
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # https://api.github.com/repos/jemalloc/jemalloc/releases/latest
-ARG jemalloc_latest_tag_name='5.2.1'
+ARG jemalloc_latest_tag_name=5.3.0
 # https://api.github.com/repos/jemalloc/jemalloc/commits?per_page=1
-ARG jemalloc_latest_commit_hash='f6699803e2772de2a4eb253d5b55f00c3842a950'
+ARG jemalloc_latest_commit_hash=21bcc0a8d49ab2944ae53c7e43f5c84fc8a34322
 ARG dockerfile_workdir=/build_root/jemalloc
 WORKDIR $dockerfile_workdir
 RUN git clone -j "$(nproc)" --no-tags --shallow-submodules --recurse-submodules --depth 1 --single-branch 'https://github.com/jemalloc/jemalloc.git' . \
@@ -35,8 +35,8 @@ FROM step3_jemalloc AS haproxy_builder
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG haproxy_branch=2.4
 ## curl -sSL "https://git.haproxy.org/?p=haproxy-${haproxy_branch}.git;a=commit;h=refs/heads/master" | tr -d '\r\n\t' | grep -Po '(?<=<td>commit<\/td><td class="sha1">)[a-zA-Z0-9]+(?=<\/td>)'
-ARG haproxy_latest_commit_hash='12460dbc67dedd1fef9dc81f59ee8154d9f6198f'
-ARG haproxy_latest_tag_name='2.4.14'
+ARG haproxy_latest_commit_hash=b9eb201aee22b2bf90e56efdc58cf7a1681d7315
+ARG haproxy_latest_tag_name=2.4.26
 ARG dockerfile_workdir=/build_root/haproxy
 WORKDIR $dockerfile_workdir
 RUN curl --retry 5 --retry-delay 10 --retry-max-time 60 -fsSL "https://git.haproxy.org/?p=haproxy-${haproxy_branch}.git;a=snapshot;h=${haproxy_latest_commit_hash};sf=tgz" | bsdtar -xf- --strip-components 1 --no-xattrs \
@@ -60,8 +60,8 @@ RUN curl --retry 5 --retry-delay 10 --retry-max-time 60 -fsSL "https://git.hapro
 
 FROM quay.io/oopus/debian:oldstable-slim AS smoking-test-debian-oldstable
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-ARG haproxy_latest_tag_name=2.2.4
-ARG jemalloc_latest_tag_name=5.2.1
+ARG haproxy_latest_tag_name=2.4.26
+ARG jemalloc_latest_tag_name=5.3.0
 COPY --from=step3_jemalloc "/build_root/jemalloc_${jemalloc_latest_tag_name}-dev-1_amd64.deb" /
 COPY --from=haproxy_builder "/build_root/haproxy_${haproxy_latest_tag_name}-1_amd64.deb" /
 RUN dpkg -i "jemalloc_${jemalloc_latest_tag_name}-dev-1_amd64.deb" \
@@ -70,8 +70,8 @@ RUN dpkg -i "jemalloc_${jemalloc_latest_tag_name}-dev-1_amd64.deb" \
 
 FROM quay.io/oopus/ubuntu:bionic AS smoking-test-ubuntu-oldoldlts
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-ARG haproxy_latest_tag_name=2.2.4
-ARG jemalloc_latest_tag_name=5.2.1
+ARG haproxy_latest_tag_name=2.4.26
+ARG jemalloc_latest_tag_name=5.3.0
 COPY --from=step3_jemalloc "/build_root/jemalloc_${jemalloc_latest_tag_name}-dev-1_amd64.deb" /
 COPY --from=haproxy_builder "/build_root/haproxy_${haproxy_latest_tag_name}-1_amd64.deb" /
 RUN dpkg -i "jemalloc_${jemalloc_latest_tag_name}-dev-1_amd64.deb" \
@@ -81,8 +81,8 @@ RUN dpkg -i "jemalloc_${jemalloc_latest_tag_name}-dev-1_amd64.deb" \
 FROM quay.io/oopus/alpine:latest AS haproxy-alpine-collection
 SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 ARG haproxy_branch=2.4
-ARG haproxy_latest_tag_name=2.4.0
-ARG jemalloc_latest_tag_name=5.2.1
+ARG haproxy_latest_tag_name=2.4.26
+ARG jemalloc_latest_tag_name=5.3.0
 COPY --from=step3_jemalloc "/build_root/jemalloc_${jemalloc_latest_tag_name}-dev-1_amd64.deb" "/build_root/"
 COPY --from=haproxy_builder "/build_root/haproxy_${haproxy_latest_tag_name}-1_amd64.deb" "/build_root/haproxy.service" "/build_root/"
 RUN apk update; apk --no-progress --no-cache add \

diff --git a/release_haproxy_alpine.Dockerfile b/release_haproxy_alpine.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker.io/docker/dockerfile-upstream:1.2.0
 FROM quay.io/oopus/haproxy_static:alpine AS haproxy_uploader
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-ARG haproxy_latest_tag_name=2.4.0
+ARG haproxy_latest_tag_name=2.4.26
 COPY got_github_release.sh /tmp/got_github_release.sh
 WORKDIR "/git/haproxy_static"
 # import secret:

diff --git a/release_haproxy_debian.Dockerfile b/release_haproxy_debian.Dockerfile
@@ -1,8 +1,8 @@
 # syntax=docker.io/docker/dockerfile-upstream:1.2.0
 FROM quay.io/oopus/haproxy_static:debian AS haproxy_uploader
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-ARG haproxy_latest_tag_name=2.4.0
-ARG jemalloc_latest_tag_name='5.2.1'
+ARG haproxy_latest_tag_name=2.4.26
+ARG jemalloc_latest_tag_name=5.3.0
 COPY got_github_release.sh /tmp/got_github_release.sh
 WORKDIR "/git/haproxy_static"
 # import secret: