Skip to content
This repository was archived by the owner on May 28, 2024. It is now read-only.

Commit 2735cf5

Browse files
committed
20240527175038
1 parent c8571b3 commit 2735cf5

File tree

7 files changed

+15
-161
lines changed

7 files changed

+15
-161
lines changed

.github/workflows/main.yml

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

.github/workflows/release.yml

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

README.md

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

haproxy_alpine_builder.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM quay.io/icecodenew/builder_image_x86_64-linux:alpine AS step1_lua54
22
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
33
## 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
4-
ARG lua_version='5.4.4'
5-
ARG image_build_date='2022-03-08'
4+
ARG lua_version=5.4.6
5+
ARG image_build_date=2024-05-28
66
ARG dockerfile_workdir=/build_root/lua
77
WORKDIR $dockerfile_workdir
88
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- -
1313

1414
FROM step1_lua54 AS haproxy_builder
1515
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
16-
ARG haproxy_branch='2.4'
16+
ARG haproxy_branch=2.4
1717
## 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>)'
18-
ARG haproxy_latest_commit_hash='12460dbc67dedd1fef9dc81f59ee8154d9f6198f'
18+
ARG haproxy_latest_commit_hash=eea7b5e866a945061ae75fbe0cb2545ba11f3b4a
1919
ARG dockerfile_workdir=/build_root/haproxy
2020
WORKDIR $dockerfile_workdir
2121
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 \

haproxy_debian_builder.Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM quay.io/icecodenew/builder_image_x86_64-linux:debian AS step1_lua54
22
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
33
## 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
4-
ARG lua_version='5.4.4'
5-
ARG image_build_date='2022-03-08'
4+
ARG lua_version=5.4.6
5+
ARG image_build_date=2024-05-28
66
ARG dockerfile_workdir=/build_root/lua
77
WORKDIR $dockerfile_workdir
88
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
1616
FROM step1_lua54 AS step3_jemalloc
1717
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1818
# https://api.github.com/repos/jemalloc/jemalloc/releases/latest
19-
ARG jemalloc_latest_tag_name='5.2.1'
19+
ARG jemalloc_latest_tag_name=5.3.0
2020
# https://api.github.com/repos/jemalloc/jemalloc/commits?per_page=1
21-
ARG jemalloc_latest_commit_hash='f6699803e2772de2a4eb253d5b55f00c3842a950'
21+
ARG jemalloc_latest_commit_hash=f9c0b5f7f8a917661db39289e38ec94d9d198f11
2222
ARG dockerfile_workdir=/build_root/jemalloc
2323
WORKDIR $dockerfile_workdir
2424
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
3535
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
3636
ARG haproxy_branch=2.4
3737
## 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>)'
38-
ARG haproxy_latest_commit_hash='12460dbc67dedd1fef9dc81f59ee8154d9f6198f'
39-
ARG haproxy_latest_tag_name='2.4.14'
38+
ARG haproxy_latest_commit_hash=eea7b5e866a945061ae75fbe0cb2545ba11f3b4a
39+
ARG haproxy_latest_tag_name=2.4.26
4040
ARG dockerfile_workdir=/build_root/haproxy
4141
WORKDIR $dockerfile_workdir
4242
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 \
@@ -61,8 +61,8 @@ RUN curl --retry 5 --retry-delay 10 --retry-max-time 60 -fsSL "https://git.hapro
6161
FROM quay.io/icecodenew/alpine:latest AS haproxy-alpine-collection
6262
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
6363
ARG haproxy_branch=2.4
64-
ARG haproxy_latest_tag_name=2.4.0
65-
ARG jemalloc_latest_tag_name=5.2.1
64+
ARG haproxy_latest_tag_name=2.4.26
65+
ARG jemalloc_latest_tag_name=5.3.0
6666
COPY --from=step3_jemalloc "/build_root/jemalloc_${jemalloc_latest_tag_name}-dev-1_amd64.deb" "/build_root/"
6767
COPY --from=haproxy_builder "/build_root/haproxy_${haproxy_latest_tag_name}-1_amd64.deb" "/build_root/haproxy.service" "/build_root/"
6868
RUN apk update; apk --no-progress --no-cache add \

release_haproxy_alpine.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker.io/docker/dockerfile-upstream:1.2.0
22
FROM quay.io/icecodenew/haproxy_static:alpine AS haproxy_uploader
33
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
4-
ARG haproxy_latest_tag_name=2.4.0
4+
ARG haproxy_latest_tag_name=2.4.26
55
COPY got_github_release.sh /tmp/got_github_release.sh
66
WORKDIR "/git/haproxy_static"
77
# import secret:

release_haproxy_debian.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# syntax=docker.io/docker/dockerfile-upstream:1.2.0
22
FROM quay.io/icecodenew/haproxy_static:debian AS haproxy_uploader
33
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
4-
ARG haproxy_latest_tag_name=2.4.0
5-
ARG jemalloc_latest_tag_name='5.2.1'
4+
ARG haproxy_latest_tag_name=2.4.26
5+
ARG jemalloc_latest_tag_name=5.3.0
66
COPY got_github_release.sh /tmp/got_github_release.sh
77
WORKDIR "/git/haproxy_static"
88
# import secret:

0 commit comments

Comments
 (0)