Skip to content

Commit e8f83a9

Browse files
committed
static-nginx
static-nginx update
1 parent 5511081 commit e8f83a9

3 files changed

Lines changed: 13 additions & 11 deletions

File tree

.github/workflows/build_docker_images-static-nginx.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
GIT_REPO_SHORT=${GIT_REPO_SHORT#"docker-"}
3838
DOCKER_REPO=${{ secrets.DOCKER_USERNAME }}/${GIT_REPO_SHORT}
3939
REDHAT_QUAY_REPO=${{ secrets.REDHAT_QUAY_USERNAME }}/${GIT_REPO_SHORT}
40-
40+
4141
#echo "ENVs: BUILD_DATE=${BUILD_DATE}, BUILD_DATE_NUMERIC=${BUILD_DATE_NUMERIC}, COMMIT_HASH=${COMMIT_HASH}, GIT_URL=${GIT_URL}, GIT_REPO=${GIT_REPO}"
4242
4343
# Set output parameters to action.
@@ -48,11 +48,13 @@ jobs:
4848
echo "git_repo=${GIT_REPO}" >> "$GITHUB_OUTPUT"
4949
echo "docker_repo=${DOCKER_REPO}" >> "$GITHUB_OUTPUT"
5050
echo "redhat_quay_repo=${REDHAT_QUAY_REPO}" >> "$GITHUB_OUTPUT"
51-
51+
5252
# build Versions
5353
PCRE2_VERSION=$(curl -s https://api.github.com/repos/PCRE2Project/pcre2/releases/latest | grep 'tag_name' | cut -d\" -f4 | sed 's/^pcre2-//')
5454
ZLIB_VERSION=$(curl -s https://api.github.com/repos/madler/zlib/releases/latest | grep 'tag_name' | cut -d\" -f4 | sed 's/^v//')
55-
OPENSSL_VERSION=$(curl -s https://api.github.com/repos/openssl/openssl/releases/latest | grep 'tag_name' | cut -d\" -f4 | sed 's/^openssl-//')
55+
#OPENSSL_VERSION=$(curl -s https://api.github.com/repos/openssl/openssl/releases/latest | grep 'tag_name' | cut -d\" -f4 | sed 's/^openssl-//')
56+
#OPENSSL_VERSION=$(curl -s https://api.github.com/repos/openssl/openssl/tags | jq -r '.[].name' | grep -E '^openssl-[0-9]+\.[0-9]+\.[0-9]+$' | sed 's/^openssl-//' | sort -V -r | grep '^3\.5\.' | head -n1)
57+
OPENSSL_VERSION=$(curl -s https://api.github.com/repos/openssl/openssl/tags | grep name | grep 'openssl-[0-9]\+\.[0-9]\+\.[0-9]\+"' | sed -E 's/.*openssl-([0-9]+\.[0-9]+\.[0-9]+).*/\1/' | sort -Vr | grep '^3\.5\.' | head -n1)
5658
NGINX_VERSION=$(curl -s https://api.github.com/repos/nginx/nginx/releases/latest | grep 'tag_name' | cut -d\" -f4 | sed 's/^release-//')
5759
echo "pcre2_version=${PCRE2_VERSION}" >> "$GITHUB_OUTPUT"
5860
echo "zlib_version=${ZLIB_VERSION}" >> "$GITHUB_OUTPUT"

static-nginx.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# build: docker build --no-cache --progress=plain --target binary -t tobi312/tools:static-nginx -f static-nginx.Dockerfile .
1+
# build: docker build --no-cache --progress=plain --target binary --build-arg NGINX_VERSION=1.29.1 -t tobi312/tools:static-nginx -f static-nginx.Dockerfile .
22
FROM alpine:latest AS builder
33

4-
ARG PCRE2_VERSION=10.45
4+
ARG PCRE2_VERSION=10.46
55
ARG ZLIB_VERSION=1.3.1
6-
ARG OPENSSL_VERSION=3.5.0
7-
ARG NGINX_VERSION=1.28.0
6+
ARG OPENSSL_VERSION=3.5.4
7+
ARG NGINX_VERSION=1.29.1
88

99
ARG VCS_REF
1010

static-nginx.unprivileged-nginxuser.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# build: docker build --no-cache --progress=plain --target binary --build-arg NGINX_VERSION=1.28.0 -t tobi312/tools:static-nginx-unprivileged-nginxuser -f static-nginx.unprivileged-nginxuser.Dockerfile .
1+
# build: docker build --no-cache --progress=plain --target binary --build-arg NGINX_VERSION=1.29.1 -t tobi312/tools:static-nginx-unprivileged-nginxuser -f static-nginx.unprivileged-nginxuser.Dockerfile .
22
FROM alpine:latest AS builder
33

4-
ARG PCRE2_VERSION=10.45
4+
ARG PCRE2_VERSION=10.46
55
ARG ZLIB_VERSION=1.3.1
6-
ARG OPENSSL_VERSION=3.5.0
7-
ARG NGINX_VERSION=1.28.0
6+
ARG OPENSSL_VERSION=3.5.4
7+
ARG NGINX_VERSION=1.29.1
88

99
ARG VCS_REF
1010

0 commit comments

Comments
 (0)