Skip to content

Commit 548c342

Browse files
neomantraneomantra
committed
ci: Restore publishing of build-from-upstream flavors
Signed-off-by: Evan Wies <evan@neomantra.net>
1 parent 7612ac6 commit 548c342

2 files changed

Lines changed: 121 additions & 120 deletions

File tree

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

Lines changed: 117 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -86,94 +86,92 @@ jobs:
8686
dockerfile: alpine-apk/Dockerfile
8787
platforms: linux/arm64
8888

89-
# # --- Rocky Linux ---
90-
# - flavor: rocky
91-
# arch: amd64
92-
# dockerfile: fedora/Dockerfile
93-
# platforms: linux/amd64
94-
# build-args: |
95-
# RESTY_IMAGE_BASE=rockylinux/rockylinux
96-
# RESTY_IMAGE_TAG=9.6
97-
# RESTY_YUM_REPO=https://openresty.org/package/rocky/openresty2.repo
98-
# RESTY_RPM_DIST=el9
99-
# RESTY_DNF_NO_REPOFILE=1
100-
# - flavor: rocky
101-
# arch: arm64
102-
# dockerfile: fedora/Dockerfile
103-
# platforms: linux/arm64
104-
# build-args: |
105-
# RESTY_IMAGE_BASE=rockylinux/rockylinux
106-
# RESTY_IMAGE_TAG=9.6
107-
# RESTY_YUM_REPO=https://openresty.org/package/rocky/openresty2.repo
108-
# RESTY_RPM_DIST=el9
109-
# RESTY_RPM_ARCH=aarch64
110-
# RESTY_DNF_NO_REPOFILE=1
111-
#
112-
# # --- Fedora ---
113-
# # Note: fedora-aarch64 is commented out in Travis CI
114-
# - flavor: fedora
115-
# arch: amd64
116-
# dockerfile: fedora/Dockerfile
117-
# platforms: linux/amd64
118-
#
119-
# # --- Debian Bookworm ---
120-
# - flavor: bookworm
121-
# arch: amd64
122-
# dockerfile: bookworm/Dockerfile
123-
# platforms: linux/amd64
124-
# - flavor: bookworm
125-
# arch: arm64
126-
# dockerfile: bookworm/Dockerfile
127-
# platforms: linux/arm64
128-
# build-args: |
129-
# RESTY_APT_REPO=https://openresty.org/package/arm64/debian
130-
# RESTY_APT_ARCH=arm64
131-
#
132-
# # --- Debian Bookworm Buildpack ---
133-
# - flavor: bookworm-buildpack
134-
# arch: amd64
135-
# dockerfile: bookworm/Dockerfile.buildpack
136-
# platforms: linux/amd64
137-
# - flavor: bookworm-buildpack
138-
# arch: arm64
139-
# dockerfile: bookworm/Dockerfile.buildpack
140-
# platforms: linux/arm64
141-
# build-args: |
142-
# RESTY_APT_REPO=https://openresty.org/package/arm64/debian
143-
# RESTY_APT_ARCH=arm64
144-
#
145-
# # --- Debian Bullseye ---
146-
# - flavor: bullseye
147-
# arch: amd64
148-
# dockerfile: bullseye/Dockerfile
149-
# platforms: linux/amd64
150-
# - flavor: bullseye
151-
# arch: arm64
152-
# dockerfile: bullseye/Dockerfile
153-
# platforms: linux/arm64
154-
# build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
155-
# # --- Debian Bullseye Debug ---
156-
# - flavor: bullseye-debug
157-
# arch: amd64
158-
# dockerfile: bullseye/Dockerfile.debug
159-
# platforms: linux/amd64
160-
# - flavor: bullseye-debug
161-
# arch: arm64
162-
# dockerfile: bullseye/Dockerfile.debug
163-
# platforms: linux/arm64
164-
# build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
165-
#
166-
# # --- Debian Bullseye Valgrind ---
167-
# - flavor: bullseye-valgrind
168-
# arch: amd64
169-
# dockerfile: bullseye/Dockerfile.valgrind
170-
# platforms: linux/amd64
171-
# - flavor: bullseye-valgrind
172-
# arch: arm64
173-
# dockerfile: bullseye/Dockerfile.valgrind
174-
# platforms: linux/arm64
175-
# build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
176-
#
89+
# --- Rocky Linux ---
90+
- flavor: rocky
91+
arch: amd64
92+
dockerfile: fedora/Dockerfile
93+
platforms: linux/amd64
94+
build-args: |
95+
RESTY_IMAGE_BASE=rockylinux/rockylinux
96+
RESTY_IMAGE_TAG=9.6
97+
RESTY_YUM_REPO=https://openresty.org/package/rocky/openresty2.repo
98+
RESTY_RPM_DIST=el9
99+
RESTY_DNF_NO_REPOFILE=1
100+
- flavor: rocky
101+
arch: arm64
102+
dockerfile: fedora/Dockerfile
103+
platforms: linux/arm64
104+
build-args: |
105+
RESTY_IMAGE_BASE=rockylinux/rockylinux
106+
RESTY_IMAGE_TAG=9.6
107+
RESTY_YUM_REPO=https://openresty.org/package/rocky/openresty2.repo
108+
RESTY_RPM_DIST=el9
109+
RESTY_RPM_ARCH=aarch64
110+
RESTY_DNF_NO_REPOFILE=1
111+
# --- Fedora ---
112+
# Note: fedora-aarch64 is commented out in Travis CI
113+
- flavor: fedora
114+
arch: amd64
115+
dockerfile: fedora/Dockerfile
116+
platforms: linux/amd64
117+
# --- Debian Bookworm ---
118+
- flavor: bookworm
119+
arch: amd64
120+
dockerfile: bookworm/Dockerfile
121+
platforms: linux/amd64
122+
- flavor: bookworm
123+
arch: arm64
124+
dockerfile: bookworm/Dockerfile
125+
platforms: linux/arm64
126+
build-args: |
127+
RESTY_APT_REPO=https://openresty.org/package/arm64/debian
128+
RESTY_APT_ARCH=arm64
129+
130+
# --- Debian Bookworm Buildpack ---
131+
- flavor: bookworm-buildpack
132+
arch: amd64
133+
dockerfile: bookworm/Dockerfile.buildpack
134+
platforms: linux/amd64
135+
- flavor: bookworm-buildpack
136+
arch: arm64
137+
dockerfile: bookworm/Dockerfile.buildpack
138+
platforms: linux/arm64
139+
build-args: |
140+
RESTY_APT_REPO=https://openresty.org/package/arm64/debian
141+
RESTY_APT_ARCH=arm64
142+
143+
# --- Debian Bullseye ---
144+
- flavor: bullseye
145+
arch: amd64
146+
dockerfile: bullseye/Dockerfile
147+
platforms: linux/amd64
148+
- flavor: bullseye
149+
arch: arm64
150+
dockerfile: bullseye/Dockerfile
151+
platforms: linux/arm64
152+
build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
153+
# --- Debian Bullseye Debug ---
154+
- flavor: bullseye-debug
155+
arch: amd64
156+
dockerfile: bullseye/Dockerfile.debug
157+
platforms: linux/amd64
158+
- flavor: bullseye-debug
159+
arch: arm64
160+
dockerfile: bullseye/Dockerfile.debug
161+
platforms: linux/arm64
162+
build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
163+
164+
# --- Debian Bullseye Valgrind ---
165+
- flavor: bullseye-valgrind
166+
arch: amd64
167+
dockerfile: bullseye/Dockerfile.valgrind
168+
platforms: linux/amd64
169+
- flavor: bullseye-valgrind
170+
arch: arm64
171+
dockerfile: bullseye/Dockerfile.valgrind
172+
platforms: linux/arm64
173+
build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
174+
177175
# --- Ubuntu Jammy ---
178176
- flavor: jammy
179177
arch: amd64
@@ -296,13 +294,13 @@ jobs:
296294
- alpine
297295
- alpine-slim
298296
- alpine-apk
299-
# - rocky
300-
# - fedora
301-
# - bookworm
302-
# - bookworm-buildpack
303-
# - bullseye
304-
# - bullseye-debug
305-
# - bullseye-valgrind
297+
- rocky
298+
- fedora
299+
- bookworm
300+
- bookworm-buildpack
301+
- bullseye
302+
- bullseye-debug
303+
- bullseye-valgrind
306304
- jammy
307305
- resolute
308306
- restyrepo
@@ -337,28 +335,28 @@ jobs:
337335
fail-fast: false
338336
matrix:
339337
include:
340-
# - flavor: bookworm-fat
341-
# base_flavor: bookworm
342-
# arch: amd64
343-
# dockerfile: bookworm/Dockerfile.fat
344-
# platforms: linux/amd64
345-
# - flavor: bookworm-fat
346-
# base_flavor: bookworm
347-
# arch: arm64
348-
# dockerfile: bookworm/Dockerfile.fat
349-
# platforms: linux/arm64
350-
#
351-
# - flavor: bullseye-fat
352-
# base_flavor: bullseye
353-
# arch: amd64
354-
# dockerfile: bullseye/Dockerfile.fat
355-
# platforms: linux/amd64
356-
# - flavor: bullseye-fat
357-
# base_flavor: bullseye
358-
# arch: arm64
359-
# dockerfile: bullseye/Dockerfile.fat
360-
# platforms: linux/arm64
361-
#
338+
- flavor: bookworm-fat
339+
base_flavor: bookworm
340+
arch: amd64
341+
dockerfile: bookworm/Dockerfile.fat
342+
platforms: linux/amd64
343+
- flavor: bookworm-fat
344+
base_flavor: bookworm
345+
arch: arm64
346+
dockerfile: bookworm/Dockerfile.fat
347+
platforms: linux/arm64
348+
349+
- flavor: bullseye-fat
350+
base_flavor: bullseye
351+
arch: amd64
352+
dockerfile: bullseye/Dockerfile.fat
353+
platforms: linux/amd64
354+
- flavor: bullseye-fat
355+
base_flavor: bullseye
356+
arch: arm64
357+
dockerfile: bullseye/Dockerfile.fat
358+
platforms: linux/arm64
359+
362360
- flavor: alpine-fat
363361
base_flavor: alpine
364362
arch: amd64
@@ -575,8 +573,8 @@ jobs:
575573
strategy:
576574
matrix:
577575
flavor:
578-
# - bookworm-fat
579-
# - bullseye-fat
576+
- bookworm-fat
577+
- bullseye-fat
580578
- alpine-fat
581579
steps:
582580
- name: Checkout

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
`docker-openresty` Changelog
22
============================
33

4-
## 1.29.2.4-1 (unreleased)
4+
## 1.29.2.4-1 (2024-05-21)
5+
6+
**All unarchived flavors are are included in this release.** Thanks to the OpenResty maintainers.
57

68
* Add Ubuntu Resolute Raccoon build-from-source flavor (`resolute`)
79
* Fix pinned OpenSSL 1.1.0 patch from commit `ed328977028c3ec3033bc25873ee360056e247cd` to `master`
810
* Remove `--seccomp-unconfined` from [HARDENING.md](./HARDENING.md) (#300)
11+
* Restore publishing of build-from-upstream flavors
912

1013
## 1.29.2.4-0 (2026-05-18)
1114

0 commit comments

Comments
 (0)