diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 55d966cb..00000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-name: Bump
-
-on:
- workflow_dispatch:
- schedule:
- - cron: "50 1-23/8 * * *"
- push:
- branches:
- - master
- paths-ignore:
- - "**/LICENSE"
- - "**/README.md"
- - "**/got_github_release.sh"
- # pull_request:
- # branches:
- # - master
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
- # This workflow contains a single job called "Bump"
- Bump:
- # The type of runner that the job will run on
- runs-on: ubuntu-latest
-
- # Steps represent a sequence of tasks that will be executed as part of the job
- steps:
- # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- - uses: actions/checkout@v2
- with:
- fetch-depth: 0
- - name: Set some variables
- run: |
- echo "RELEASE_NAME=$(date +%Y%m%d%H%M%S)" >> $GITHUB_ENV
- echo "TAG_NAME=$(date +%Y%m%d%H%M%S)" >> $GITHUB_ENV
- echo "REPO_URL=github.com/${{ github.repository }}" >> $GITHUB_ENV
- echo "jemalloc_latest_tag_name=$(curl -sL -H 'Accept: application/vnd.github.v3+json' \
- 'https://api.github.com/repos/jemalloc/jemalloc/releases/latest' |
- grep -F 'tag_name' | cut -d'"' -f4)" >> $GITHUB_ENV
- echo "jemalloc_latest_commit_hash=$(curl -sSL -H 'Accept: application/vnd.github.v3+json' \
- 'https://api.github.com/repos/jemalloc/jemalloc/commits?per_page=1' |
- grep -Fm1 'sha' | cut -d'"' -f4)" >> $GITHUB_ENV
- echo "lua_version=$(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)" >> $GITHUB_ENV
- echo "haproxy_branch=2.4" >> $GITHUB_ENV
- echo "haproxy_latest_commit_hash=$(export 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 '(?<=| commit<\/td> | )[a-zA-Z0-9]+(?=<\/td>)')" >> $GITHUB_ENV
- echo "haproxy_latest_tag_name=$(export haproxy_branch=2.4 && curl -sSL \
- "https://git.haproxy.org/?p=haproxy-${haproxy_branch}.git;a=tags" | tr -d '\r\n\t' |
- grep -Po "(?<=a=shortlog;h=refs\/tags\/v)${haproxy_branch}\.[0-9]+" |
- LC_ALL=C sort -Vr | head -n 1)" >> $GITHUB_ENV
- echo "image_build_date=$(TZ=':Asia/Taipei' date +%F)" >> $GITHUB_ENV
- shell: bash
- # Runs a set of commands using the runners shell
- - name: Force push `release` branch
- run: |
- git config --local user.name "actions"
- git config --local user.email "action@github.com"
- git checkout release
- git reset --hard origin/master
- sed -i -E "s/^ARG jemalloc_latest_tag_name=.+/ARG jemalloc_latest_tag_name=${jemalloc_latest_tag_name:?empty value}/" haproxy_alpine_builder.Dockerfile haproxy_debian_builder.Dockerfile release_haproxy_alpine.Dockerfile release_haproxy_debian.Dockerfile
- sed -i -E "s/^ARG jemalloc_latest_commit_hash=.+/ARG jemalloc_latest_commit_hash=${jemalloc_latest_commit_hash:?empty value}/" haproxy_alpine_builder.Dockerfile haproxy_debian_builder.Dockerfile release_haproxy_alpine.Dockerfile release_haproxy_debian.Dockerfile
- sed -i -E "s/^ARG haproxy_branch=.+/ARG haproxy_branch=${haproxy_branch:?empty value}/" haproxy_alpine_builder.Dockerfile haproxy_debian_builder.Dockerfile release_haproxy_alpine.Dockerfile release_haproxy_debian.Dockerfile
- sed -i -E "s/^ARG haproxy_latest_commit_hash=.+/ARG haproxy_latest_commit_hash=${haproxy_latest_commit_hash:?empty value}/" haproxy_alpine_builder.Dockerfile haproxy_debian_builder.Dockerfile release_haproxy_alpine.Dockerfile release_haproxy_debian.Dockerfile
- sed -i -E "s/^ARG haproxy_latest_tag_name=.+/ARG haproxy_latest_tag_name=${haproxy_latest_tag_name:?empty value}/" haproxy_alpine_builder.Dockerfile haproxy_debian_builder.Dockerfile release_haproxy_alpine.Dockerfile release_haproxy_debian.Dockerfile
- sed -i -E "s/^ARG lua_version=.+/ARG lua_version=${lua_version:?empty value}/" haproxy_alpine_builder.Dockerfile haproxy_debian_builder.Dockerfile
- sed -i -E "s/^ARG image_build_date=.+/ARG image_build_date=${image_build_date:?empty value}/" haproxy_alpine_builder.Dockerfile haproxy_debian_builder.Dockerfile
- git add haproxy_alpine_builder.Dockerfile haproxy_debian_builder.Dockerfile release_haproxy_alpine.Dockerfile release_haproxy_debian.Dockerfile got_github_release.sh
- git rm README.md
- git rm -r .github
- git commit -m "${{ env.RELEASE_NAME }}"
- git push -f -u origin release
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index cfd86af1..00000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: Release
-
-on:
- workflow_dispatch:
- schedule:
- - cron: "45 18 * * *"
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
- # This workflow contains a single job called "release"
- release:
- # The type of runner that the job will run on
- runs-on: ubuntu-latest
-
- # Steps represent a sequence of tasks that will be executed as part of the job
- steps:
- -
- name: Checkout code
- uses: actions/checkout@v2
- with:
- ref: 'release'
- fetch-depth: 0
- -
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
- # -
- # name: Login to DockerHub
- # uses: docker/login-action@v1
- # with:
- # username: ${{ secrets.DOCKER_USERNAME }}
- # password: ${{ secrets.DOCKER_PASSWORD }}
- -
- name: Release alpine
- uses: docker/build-push-action@v2
- with:
- context: .
- file: release_haproxy_alpine.Dockerfile
- pull: true
- push: false
- secrets: |
- GIT_AUTH_TOKEN=${{ secrets.GIT_AUTH_TOKEN }}
- # cache-from: type=registry,ref=myorg/myrepository:latest
- # cache-to: type=inline
- # tags: myorg/myrepository:latest
- -
- name: Release debian
- uses: docker/build-push-action@v2
- with:
- context: .
- file: release_haproxy_debian.Dockerfile
- pull: true
- push: false
- secrets: |
- GIT_AUTH_TOKEN=${{ secrets.GIT_AUTH_TOKEN }}
- # cache-from: type=registry,ref=myorg/myrepository:latest
- # cache-to: type=inline
- # tags: myorg/myrepository:latest
diff --git a/README.md b/README.md
deleted file mode 100644
index 2fad1e5d..00000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# haproxy_static
-Build-in OpenSSL, libslz, PCRE2_JIT, lua 5.4, prometheus support; Use jemalloc (dynamic linked)
diff --git a/haproxy_alpine_builder.Dockerfile b/haproxy_alpine_builder.Dockerfile
index a4aed614..0b7ad6de 100644
--- a/haproxy_alpine_builder.Dockerfile
+++ b/haproxy_alpine_builder.Dockerfile
@@ -1,8 +1,8 @@
FROM quay.io/icecodenew/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.4
+ARG image_build_date=2023-01-27
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 '(?<= | commit<\/td> | )[a-zA-Z0-9]+(?=<\/td>)'
-ARG haproxy_latest_commit_hash='12460dbc67dedd1fef9dc81f59ee8154d9f6198f'
+ARG haproxy_latest_commit_hash=18a194c6e26436e87b9e32f69b3bcd8e6ce5ca81
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
index 3be20467..7d4adf68 100644
--- a/haproxy_debian_builder.Dockerfile
+++ b/haproxy_debian_builder.Dockerfile
@@ -1,8 +1,8 @@
FROM quay.io/icecodenew/builder_image_x86_64-linux:debian 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.4
+ARG image_build_date=2023-01-27
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=8580c65f81c5252e493da656a448ec3a8571dab7
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 '(?<= | commit<\/td> | )[a-zA-Z0-9]+(?=<\/td>)'
-ARG haproxy_latest_commit_hash='12460dbc67dedd1fef9dc81f59ee8154d9f6198f'
-ARG haproxy_latest_tag_name='2.4.14'
+ARG haproxy_latest_commit_hash=18a194c6e26436e87b9e32f69b3bcd8e6ce5ca81
+ARG haproxy_latest_tag_name=2.4.20
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 \
@@ -61,8 +61,8 @@ RUN curl --retry 5 --retry-delay 10 --retry-max-time 60 -fsSL "https://git.hapro
FROM quay.io/icecodenew/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.20
+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
index 6f7ad054..745b09e0 100644
--- 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/icecodenew/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.20
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
index 83200017..5525e1f8 100644
--- 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/icecodenew/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.20
+ARG jemalloc_latest_tag_name=5.3.0
COPY got_github_release.sh /tmp/got_github_release.sh
WORKDIR "/git/haproxy_static"
# import secret:
|