Skip to content

Commit 79530ad

Browse files
neomantraneomantra
committed
Enable 1.29 for build-from-upstream flavors
Signed-off-by: Evan Wies <evan@neomantra.net>
1 parent 1c80a49 commit 79530ad

File tree

7 files changed

+141
-125
lines changed

7 files changed

+141
-125
lines changed

‎.github/workflows/docker-publish.yml‎

Lines changed: 107 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
arch: arm64
5050
dockerfile: alpine/Dockerfile
5151
platforms: linux/arm64
52-
52+
5353
# --- Alpine Slim ---
5454
- flavor: alpine-slim
5555
arch: amd64
@@ -62,103 +62,104 @@ jobs:
6262
platforms: linux/arm64
6363
build-args: RESTY_STRIP_BINARIES=1
6464

65-
# --- Alpine APK ---
66-
#- flavor: alpine-apk
67-
# arch: amd64
68-
# dockerfile: alpine-apk/Dockerfile
69-
# platforms: linux/amd64
70-
#- flavor: alpine-apk
71-
# arch: arm64
72-
# dockerfile: alpine-apk/Dockerfile
73-
# platforms: linux/arm64
65+
# -- Alpine APK ---
66+
- flavor: alpine-apk
67+
arch: amd64
68+
dockerfile: alpine-apk/Dockerfile
69+
platforms: linux/amd64
70+
- flavor: alpine-apk
71+
arch: arm64
72+
dockerfile: alpine-apk/Dockerfile
73+
platforms: linux/arm64
7474

7575
# --- Rocky Linux ---
76-
#- flavor: rocky
77-
# arch: amd64
78-
# dockerfile: fedora/Dockerfile
79-
# platforms: linux/amd64
80-
# build-args: |
81-
# RESTY_IMAGE_BASE=rockylinux
82-
# RESTY_IMAGE_TAG=8.5
83-
# RESTY_YUM_REPO=https://openresty.org/package/rocky/openresty.repo
84-
# RESTY_RPM_DIST=el8
85-
#- flavor: rocky
86-
# arch: arm64
87-
# dockerfile: fedora/Dockerfile
88-
# platforms: linux/arm64
89-
# build-args: |
90-
# RESTY_IMAGE_BASE=rockylinux
91-
# RESTY_IMAGE_TAG=8.5
92-
# RESTY_YUM_REPO=https://openresty.org/package/rocky/openresty.repo
93-
# RESTY_RPM_DIST=el8
94-
# RESTY_RPM_ARCH=aarch64
76+
- flavor: rocky
77+
arch: amd64
78+
dockerfile: fedora/Dockerfile
79+
platforms: linux/amd64
80+
build-args: |
81+
RESTY_IMAGE_BASE=rockylinux/rockylinux
82+
RESTY_IMAGE_TAG=9.6
83+
RESTY_YUM_REPO=https://openresty.org/package/rocky/openresty2.repo
84+
RESTY_RPM_DIST=el9
85+
RESTY_DNF_NO_REPOFILE=1
86+
- flavor: rocky
87+
arch: arm64
88+
dockerfile: fedora/Dockerfile
89+
platforms: linux/arm64
90+
build-args: |
91+
RESTY_IMAGE_BASE=rockylinux/rockylinux
92+
RESTY_IMAGE_TAG=9.6
93+
RESTY_YUM_REPO=https://openresty.org/package/rocky/openresty2.repo
94+
RESTY_RPM_DIST=el9
95+
RESTY_RPM_ARCH=aarch64
96+
RESTY_DNF_NO_REPOFILE=1
9597
9698
# --- Fedora ---
9799
# Note: fedora-aarch64 is commented out in Travis CI
98-
#- flavor: fedora
99-
# arch: amd64
100-
# dockerfile: fedora/Dockerfile
101-
# platforms: linux/amd64
100+
- flavor: fedora
101+
arch: amd64
102+
dockerfile: fedora/Dockerfile
103+
platforms: linux/amd64
102104

103105
# --- Debian Bookworm ---
104-
#- flavor: bookworm
105-
# arch: amd64
106-
# dockerfile: bookworm/Dockerfile
107-
# platforms: linux/amd64
108-
#- flavor: bookworm
109-
# arch: arm64
110-
# dockerfile: bookworm/Dockerfile
111-
# platforms: linux/arm64
112-
# build-args: |
113-
# RESTY_APT_REPO=https://openresty.org/package/arm64/debian
114-
# RESTY_APT_ARCH=arm64
106+
- flavor: bookworm
107+
arch: amd64
108+
dockerfile: bookworm/Dockerfile
109+
platforms: linux/amd64
110+
- flavor: bookworm
111+
arch: arm64
112+
dockerfile: bookworm/Dockerfile
113+
platforms: linux/arm64
114+
build-args: |
115+
RESTY_APT_REPO=https://openresty.org/package/arm64/debian
116+
RESTY_APT_ARCH=arm64
115117
116118
# --- Debian Bookworm Buildpack ---
117-
#- flavor: bookworm-buildpack
118-
# arch: amd64
119-
# dockerfile: bookworm/Dockerfile.buildpack
120-
# platforms: linux/amd64
121-
#- flavor: bookworm-buildpack
122-
# arch: arm64
123-
# dockerfile: bookworm/Dockerfile.buildpack
124-
# platforms: linux/arm64
125-
# build-args: |
126-
# RESTY_APT_REPO=https://openresty.org/package/arm64/debian
127-
# RESTY_APT_ARCH=arm64
128-
119+
- flavor: bookworm-buildpack
120+
arch: amd64
121+
dockerfile: bookworm/Dockerfile.buildpack
122+
platforms: linux/amd64
123+
- flavor: bookworm-buildpack
124+
arch: arm64
125+
dockerfile: bookworm/Dockerfile.buildpack
126+
platforms: linux/arm64
127+
build-args: |
128+
RESTY_APT_REPO=https://openresty.org/package/arm64/debian
129+
RESTY_APT_ARCH=arm64
130+
129131
# --- Debian Bullseye ---
130-
#- flavor: bullseye
131-
# arch: amd64
132-
# dockerfile: bullseye/Dockerfile
133-
# platforms: linux/amd64
134-
#- flavor: bullseye
135-
# arch: arm64
136-
# dockerfile: bullseye/Dockerfile
137-
# platforms: linux/arm64
138-
# build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
139-
132+
- flavor: bullseye
133+
arch: amd64
134+
dockerfile: bullseye/Dockerfile
135+
platforms: linux/amd64
136+
- flavor: bullseye
137+
arch: arm64
138+
dockerfile: bullseye/Dockerfile
139+
platforms: linux/arm64
140+
build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
140141
# --- Debian Bullseye Debug ---
141-
#- flavor: bullseye-debug
142-
# arch: amd64
143-
# dockerfile: bullseye/Dockerfile.debug
144-
# platforms: linux/amd64
145-
#- flavor: bullseye-debug
146-
# arch: arm64
147-
# dockerfile: bullseye/Dockerfile.debug
148-
# platforms: linux/arm64
149-
# build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
150-
142+
- flavor: bullseye-debug
143+
arch: amd64
144+
dockerfile: bullseye/Dockerfile.debug
145+
platforms: linux/amd64
146+
- flavor: bullseye-debug
147+
arch: arm64
148+
dockerfile: bullseye/Dockerfile.debug
149+
platforms: linux/arm64
150+
build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
151+
151152
# --- Debian Bullseye Valgrind ---
152-
#- flavor: bullseye-valgrind
153-
# arch: amd64
154-
# dockerfile: bullseye/Dockerfile.valgrind
155-
# platforms: linux/amd64
156-
#- flavor: bullseye-valgrind
157-
# arch: arm64
158-
# dockerfile: bullseye/Dockerfile.valgrind
159-
# platforms: linux/arm64
160-
# build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
161-
153+
- flavor: bullseye-valgrind
154+
arch: amd64
155+
dockerfile: bullseye/Dockerfile.valgrind
156+
platforms: linux/amd64
157+
- flavor: bullseye-valgrind
158+
arch: arm64
159+
dockerfile: bullseye/Dockerfile.valgrind
160+
platforms: linux/arm64
161+
build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
162+
162163
# --- Ubuntu Jammy ---
163164
- flavor: jammy
164165
arch: amd64
@@ -285,27 +286,27 @@ jobs:
285286
fail-fast: false
286287
matrix:
287288
include:
288-
#- flavor: bookworm-fat
289-
# base_flavor: bookworm
290-
# arch: amd64
291-
# dockerfile: bookworm/Dockerfile.fat
292-
# platforms: linux/amd64
293-
#- flavor: bookworm-fat
294-
# base_flavor: bookworm
295-
# arch: arm64
296-
# dockerfile: bookworm/Dockerfile.fat
297-
# platforms: linux/arm64
289+
- flavor: bookworm-fat
290+
base_flavor: bookworm
291+
arch: amd64
292+
dockerfile: bookworm/Dockerfile.fat
293+
platforms: linux/amd64
294+
- flavor: bookworm-fat
295+
base_flavor: bookworm
296+
arch: arm64
297+
dockerfile: bookworm/Dockerfile.fat
298+
platforms: linux/arm64
298299

299-
#- flavor: bullseye-fat
300-
# base_flavor: bullseye
301-
# arch: amd64
302-
# dockerfile: bullseye/Dockerfile.fat
303-
# platforms: linux/amd64
304-
#- flavor: bullseye-fat
305-
# base_flavor: bullseye
306-
# arch: arm64
307-
# dockerfile: bullseye/Dockerfile.fat
308-
# platforms: linux/arm64
300+
- flavor: bullseye-fat
301+
base_flavor: bullseye
302+
arch: amd64
303+
dockerfile: bullseye/Dockerfile.fat
304+
platforms: linux/amd64
305+
- flavor: bullseye-fat
306+
base_flavor: bullseye
307+
arch: arm64
308+
dockerfile: bullseye/Dockerfile.fat
309+
platforms: linux/arm64
309310

310311
- flavor: alpine-fat
311312
base_flavor: alpine

‎BUILDING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ docker build --build-arg RESTY_RPM_FLAVOR="-debug" -f fedora/Dockerfile .
125125
|RESTY_RPM_VERSION | "1.27.1.2-1" | The `openresty` package version to install. |
126126
|RESTY_RPM_DIST | "el8" | The `openresty` package distribution to install. |
127127
|RESTY_RPM_ARCH | "x86_64" | The `openresty` package architecture to install. |
128-
128+
|RESTY_DNF_NO_REPOFILE | "" | Set to `1` if there is no `
129129
[Back to TOC](#table-of-contents)
130130

131131

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
`docker-openresty` Changelog
22
============================
33

4+
## 1.29.2.1-1 (2026-03-20)
5+
6+
* Enable build-from-upstream flavors:
7+
* `alpine-apk`, `bookworm`, `bullseye`, `fedora`, `rocky`
8+
9+
* Upgrade Fedora Linux to `fedora:43`
10+
* Upgrade Rocky Linux to `9.7 el9` and use `rockylinux/rockylinux` instead of `docker/rockylinux`
11+
* Fix `alpine-apk` and downgrade it to the highest supported upsream version of `3.18` serios
12+
* Fix builds between Rocky and Fedora with `RESTY_DNF_NO_REPOFILE` build arg
13+
414
## 1.29.2.1-0 (2026-03-05)
515

616
**This release only includes build-from-source flavors:

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ It is best practice to pin your images to an explicit image tag. The [next sect
4141

4242
| Image | Description |
4343
| --- | --- |
44-
| `openresty/openresty:1.27.1.2-0-jammy` | Built-from-source Ubuntu Jammy |
45-
| `openresty/openresty:1.27.1.2-0-focal` | Built-from-source Ubuntu Focal |
46-
| `openresty/openresty:1.27.1.2-0-bookworm-fat` | Built-from-upstream Debian Bookworm |
47-
| `openresty/openresty:1.27.1.2-0-alpine` | Built-from-source Alpine |
48-
| `openresty/openresty:1.27.1.2-0-alpine-apk` | Built-from-upstream Alpine |
44+
| `openresty/openresty:1.29.2.1-0-noble` | Built-from-source Ubuntu Noble |
45+
| `openresty/openresty:1.29.2.1-0-jammy` | Built-from-source Ubuntu Jammy |
46+
| `openresty/openresty:1.29.2.1-0-bookworm-fat` | Built-from-upstream Debian Bookworm |
47+
| `openresty/openresty:1.29.2.1-0-alpine` | Built-from-source Alpine |
48+
| `openresty/openresty:1.29.2.1-0-alpine-apk` | Built-from-upstream Alpine |
4949

5050
These are examples of untagged image names, for reference:
5151

‎Taskfile.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ tasks:
2222
build-all-upstream-arm64:
2323
cmds:
2424
- docker build -t alpine-apk-aarch64 -f alpine-apk/Dockerfile .
25-
- docker build -t rocky-aarch64 -f fedora/Dockerfile --build-arg RESTY_IMAGE_BASE=rockylinux --build-arg RESTY_IMAGE_TAG=8.5 --build-arg RESTY_YUM_REPO="https://openresty.org/package/rocky/openresty.repo" --build-arg RESTY_RPM_DIST="el8" --build-arg RESTY_RPM_ARCH="aarch64" .
25+
- docker build -t rocky-aarch64 -f fedora/Dockerfile --build-arg RESTY_IMAGE_BASE=rockylinux/rockylinux --build-arg RESTY_IMAGE_TAG=9.6 --build-arg RESTY_YUM_REPO="https://openresty.org/package/rocky/openresty2.repo" --build-arg RESTY_RPM_DIST="el9" --build-arg RESTY_DNF_NO_REPOFILE="1" --build-arg RESTY_RPM_ARCH="aarch64" .
2626
- docker build -t fedora-aarch64 -f fedora/Dockerfile --build-arg RESTY_RPM_ARCH=aarch64 .
2727
- docker build -t bookworm-aarch64 -f bookworm/Dockerfile --build-arg RESTY_APT_REPO="https://openresty.org/package/arm64/debian" --build-arg RESTY_APT_ARCH="arm64" .
2828
- docker build -t bullseye-aarch64 -f bullseye/Dockerfile --build-arg RESTY_APT_REPO="https://openresty.org/package/arm64/debian" .
2929

3030
build-all-upstream-amd64:
3131
cmds:
3232
- docker build -t alpine-apk-amd64 -f alpine-apk/Dockerfile .
33-
- docker build -t rocky-amd64 -f fedora/Dockerfile --build-arg RESTY_IMAGE_BASE=rockylinux --build-arg RESTY_IMAGE_TAG=8.5 --build-arg RESTY_YUM_REPO="https://openresty.org/package/rocky/openresty.repo" --build-arg RESTY_RPM_DIST="el8" --build-arg RESTY_RPM_ARCH="x86_64" .
33+
- docker build -t rocky-amd64 -f fedora/Dockerfile --build-arg RESTY_IMAGE_BASE=rockylinux/rockylinux --build-arg RESTY_IMAGE_TAG=9.6 --build-arg RESTY_YUM_REPO="https://openresty.org/package/rocky/openresty2.repo" --build-arg RESTY_RPM_DIST="el9" --build-arg RESTY_DNF_NO_REPOFILE="1" --build-arg RESTY_RPM_ARCH="x86_64" .
3434
- docker build -t fedora-amd64 -f fedora/Dockerfile --build-arg RESTY_RPM_ARCH=x86_64 .
3535
- docker build -t bookworm-amd64 -f bookworm/Dockerfile --build-arg RESTY_APT_ARCH=amd64 .
3636
- docker build -t bullseye-amd64 -f bullseye/Dockerfile --build-arg RESTY_APT_ARCH=amd64 .

‎alpine-apk/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
# https://github.com/openresty/docker-openresty
33

44
ARG RESTY_IMAGE_BASE="alpine"
5-
ARG RESTY_IMAGE_TAG="3.22.3"
5+
ARG RESTY_IMAGE_TAG="3.18.12"
66

77
FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG}
88

99
LABEL maintainer="Evan Wies <evan@neomantra.net>"
1010

1111
# Docker Build Arguments
1212
ARG RESTY_IMAGE_BASE="alpine"
13-
ARG RESTY_IMAGE_TAG="3.22.3"
13+
ARG RESTY_IMAGE_TAG="3.18.12"
1414

15-
ARG RESTY_APK_ALPINE_VERSION="3.22"
15+
ARG RESTY_APK_ALPINE_VERSION="3.18"
1616
ARG RESTY_APK_KEY_URL="https://openresty.org/package/admin@openresty.com-5ea678a6.rsa.pub"
1717
ARG RESTY_APK_REPO_URL="https://openresty.org/package/alpine/v${RESTY_APK_ALPINE_VERSION}/main"
18-
ARG RESTY_APK_VERSION="=1.29.1.2-r0"
18+
ARG RESTY_APK_VERSION="=1.29.2.1-r0"
1919

2020
LABEL resty_image_base="${RESTY_IMAGE_BASE}"
2121
LABEL resty_image_tag="${RESTY_IMAGE_TAG}"

‎fedora/Dockerfile‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22
# https://github.com/openresty/docker-openresty
33

44
ARG RESTY_IMAGE_BASE="fedora"
5-
ARG RESTY_IMAGE_TAG="42"
5+
ARG RESTY_IMAGE_TAG="43"
66

77
FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG}
88

99
LABEL maintainer="Evan Wies <evan@neomantra.net>"
1010

1111
ARG RESTY_IMAGE_BASE="fedora"
12-
ARG RESTY_IMAGE_TAG="42"
12+
ARG RESTY_IMAGE_TAG="43"
1313
ARG RESTY_LUAROCKS_VERSION="3.13.0"
1414
ARG RESTY_YUM_REPO="https://openresty.org/package/fedora/openresty.repo"
1515
ARG RESTY_RPM_FLAVOR=""
1616
ARG RESTY_RPM_VERSION="1.29.2.1-1"
17-
ARG RESTY_RPM_DIST="fc42"
17+
ARG RESTY_RPM_DIST="fc36"
1818
ARG RESTY_RPM_ARCH="x86_64"
19+
ARG RESTY_DNF_NO_REPOFILE=""
1920

2021
LABEL resty_image_base="${RESTY_IMAGE_BASE}"
2122
LABEL resty_image_tag="${RESTY_IMAGE_TAG}"
@@ -26,10 +27,14 @@ LABEL resty_rpm_version="${RESTY_RPM_VERSION}"
2627
LABEL resty_rpm_dist="${RESTY_RPM_DIST}"
2728
LABEL resty_rpm_arch="${RESTY_RPM_ARCH}"
2829

29-
RUN dnf install -y wget \
30-
&& wget ${RESTY_YUM_REPO} \
31-
&& dnf install -y dnf-plugins-core \
32-
&& dnf config-manager --add-repo ${RESTY_YUM_REPO} \
30+
RUN if [ -n "${RESTY_DNF_NO_REPOFILE}" ]; then \
31+
echo "HELLO" && dnf install -y wget \
32+
&& wget ${RESTY_YUM_REPO} \
33+
&& dnf install -y dnf-plugins-core \
34+
&& dnf config-manager --add-repo ${RESTY_YUM_REPO} ; \
35+
else \
36+
echo "WORLD" && dnf install -y dnf-plugins-core && dnf config-manager addrepo --from-repofile="${RESTY_YUM_REPO}" ; \
37+
fi \
3338
&& dnf install -y \
3439
gettext \
3540
make \

0 commit comments

Comments
 (0)