Skip to content

Commit 8562fca

Browse files
committed
Archive EOL Centos and Ubuntu flavors
Signed-off-by: Evan Wies <evan@neomantra.net>
1 parent 35b5c85 commit 8562fca

12 files changed

Lines changed: 52 additions & 261 deletions

.github/workflows/docker-publish.yml

Lines changed: 1 addition & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -72,27 +72,6 @@ jobs:
7272
dockerfile: alpine-apk/Dockerfile
7373
platforms: linux/arm64
7474

75-
# --- Amazon Linux 2 ---
76-
- flavor: amzn2
77-
arch: amd64
78-
dockerfile: centos/Dockerfile
79-
platforms: linux/amd64
80-
build-args: |
81-
RESTY_IMAGE_BASE=amazonlinux
82-
RESTY_IMAGE_TAG=2
83-
RESTY_YUM_REPO=https://openresty.org/package/amazon/openresty.repo
84-
RESTY_RPM_DIST=amzn2
85-
- flavor: amzn2
86-
arch: arm64
87-
dockerfile: centos/Dockerfile
88-
platforms: linux/arm64
89-
build-args: |
90-
RESTY_IMAGE_BASE=amazonlinux
91-
RESTY_IMAGE_TAG=2
92-
RESTY_YUM_REPO=https://openresty.org/package/amazon/openresty.repo
93-
RESTY_RPM_DIST=amzn2
94-
RESTY_RPM_ARCH=aarch64
95-
9675
# --- Rocky Linux ---
9776
- flavor: rocky
9877
arch: amd64
@@ -114,28 +93,6 @@ jobs:
11493
RESTY_RPM_DIST=el8
11594
RESTY_RPM_ARCH=aarch64
11695
117-
# --- CentOS ---
118-
- flavor: centos
119-
arch: amd64
120-
dockerfile: centos/Dockerfile
121-
platforms: linux/amd64
122-
- flavor: centos
123-
arch: arm64
124-
dockerfile: centos/Dockerfile
125-
platforms: linux/arm64
126-
build-args: RESTY_RPM_ARCH=aarch64
127-
128-
# --- CentOS 7 ---
129-
- flavor: centos7
130-
arch: amd64
131-
dockerfile: centos7/Dockerfile
132-
platforms: linux/amd64
133-
- flavor: centos7
134-
arch: arm64
135-
dockerfile: centos7/Dockerfile
136-
platforms: linux/arm64
137-
build-args: RESTY_RPM_ARCH=aarch64
138-
13996
# --- Fedora ---
14097
# Note: fedora-aarch64 is commented out in Travis CI
14198
- flavor: fedora
@@ -202,34 +159,6 @@ jobs:
202159
platforms: linux/arm64
203160
build-args: RESTY_APT_REPO=https://openresty.org/package/arm64/debian
204161

205-
# --- Ubuntu Bionic ---
206-
- flavor: bionic
207-
arch: amd64
208-
dockerfile: bionic/Dockerfile
209-
platforms: linux/amd64
210-
- flavor: bionic
211-
arch: arm64
212-
dockerfile: bionic/Dockerfile
213-
platforms: linux/arm64
214-
- flavor: bionic
215-
arch: s390x
216-
dockerfile: bionic/Dockerfile
217-
platforms: linux/s390x
218-
219-
# --- Ubuntu Focal ---
220-
- flavor: focal
221-
arch: amd64
222-
dockerfile: focal/Dockerfile
223-
platforms: linux/amd64
224-
- flavor: focal
225-
arch: arm64
226-
dockerfile: focal/Dockerfile
227-
platforms: linux/arm64
228-
- flavor: focal
229-
arch: s390x
230-
dockerfile: focal/Dockerfile
231-
platforms: linux/s390x
232-
233162
# --- Ubuntu Jammy ---
234163
- flavor: jammy
235164
arch: amd64
@@ -323,7 +252,7 @@ jobs:
323252
runs-on: ubuntu-latest
324253
strategy:
325254
matrix:
326-
flavor: [alpine, alpine-slim, alpine-apk, amzn2, rocky, centos, centos7, fedora, bookworm, bookworm-buildpack, bullseye, bullseye-debug, bullseye-valgrind, bionic, focal, jammy, noble]
255+
flavor: [alpine, alpine-slim, alpine-apk, rocky, fedora, bookworm, bookworm-buildpack, bullseye, bullseye-debug, bullseye-valgrind, jammy, noble]
327256
steps:
328257
- name: Checkout
329258
uses: actions/checkout@v4

BUILDING.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,14 @@ This Docker image can be built and customized by cloning the repo and running `d
1717
```
1818
git clone https://github.com/openresty/docker-openresty.git
1919
cd docker-openresty
20-
docker build -t myopenresty -f bionic/Dockerfile .
20+
docker build -t myopenresty -f noble/Dockerfile .
2121
docker run myopenresty
2222
```
2323

2424
Dockerfiles are provided for the following base systems, selecting the Dockerfile path with `-f`:
2525

2626
* [Alpine](https://github.com/openresty/docker-openresty/blob/master/alpine/Dockerfile) (`alpine/Dockerfile`)
2727
* [Alpine Fat](https://github.com/openresty/docker-openresty/blob/master/alpine/Dockerfile.fat) (`alpine/Dockerfile.fat`)
28-
* [Ubuntu Bionic](https://github.com/openresty/docker-openresty/blob/master/bionic/Dockerfile) (`bionic/Dockerfile`)
29-
* [Ubuntu Focal](https://github.com/openresty/docker-openresty/blob/master/focal/Dockerfile) (`focal/Dockerfile`)
3028
* [Ubuntu Jammy](https://github.com/openresty/docker-openresty/blob/master/jammy/Dockerfile) (`jammy/Dockerfile`)
3129
* [Ubuntu Noble](https://github.com/openresty/docker-openresty/blob/master/noble/Dockerfile) (`noble/Dockerfile`)
3230

@@ -109,15 +107,11 @@ OpenResty now now has [RPMs available](https://openresty.org/en/rpm-packages.htm
109107

110108
This Docker image can be built and customized by cloning the repo and running `docker build` with the desired Dockerfile:
111109

112-
* [CentOS 7 RPM](https://github.com/openresty/docker-openresty/blob/master/centos7/Dockerfile) (`centos/Dockerfile`)
113-
* [CentOS 8 RPM](https://github.com/openresty/docker-openresty/blob/master/centos/Dockerfile) (`centos/Dockerfile`)
114110
* [Fedora 35 RPM](https://github.com/openresty/docker-openresty/blob/master/fedora/Dockerfile) (`centos/Dockerfile`)
115111

116112
The following are the available build-time options. They can be set using the `--build-arg` CLI argument, like so:
117113

118114
```
119-
docker build --build-arg RESTY_RPM_FLAVOR="-debug" centos7/Dockerfile .
120-
docker build --build-arg RESTY_RPM_FLAVOR="-debug" centos/Dockerfile .
121115
docker build --build-arg RESTY_RPM_FLAVOR="-debug" -f fedora/Dockerfile .
122116
```
123117

CHANGELOG.md

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

4+
## 1.29.2.1-0 (2026-03-02)
5+
6+
* Archive `bionic` and `focal` as they are vanilla EOL
7+
* Archive `amzn2`, `centos`, and `centos7` as they are EOL.
8+
49
## 1.27.1.2-11 (2026-02-09)
510

611
* `latest` tag matches latest tagged `bookworm` release (#294)

README.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,11 @@ Supported tags and respective `Dockerfile` links
9797
The following "flavors" are available and built from [upstream OpenResty packages](https://openresty.org/en/linux-packages.html):
9898

9999
- [`alpine-apk`, (*alpine-apk/Dockerfile*)](https://github.com/openresty/docker-openresty/blob/master/alpine-apk/Dockerfile)
100-
- [`amzn2`, (*centos/Dockerfile* with `amzn2`)](https://github.com/openresty/docker-openresty/blob/master/centos/Dockerfile)
101100
- [`bookworm-buildpack`, (*bookworm/Dockerfile.buildpack*)](https://github.com/openresty/docker-openresty/blob/master/bookworm/Dockerfile.buildpack)
102101
- [`bookworm-fat`, (*bookworm/Dockerfile.fat*)](https://github.com/openresty/docker-openresty/blob/master/bookworm/Dockerfile.fat)
103102
- [`bookworm`, (*bookworm/Dockerfile*)](https://github.com/openresty/docker-openresty/blob/master/bookworm/Dockerfile)
104103
- [`bullseye-fat`, (*bullseye/Dockerfile.fat*)](https://github.com/openresty/docker-openresty/blob/master/bullseye/Dockerfile.fat)
105104
- [`bullseye`, (*bullseye/Dockerfile*)](https://github.com/openresty/docker-openresty/blob/master/bullseye/Dockerfile)
106-
- [`centos`, `centos-rpm`, (*centos/Dockerfile* with `el8`)](https://github.com/openresty/docker-openresty/blob/master/centos/Dockerfile)
107-
- [`centos7`, (*centos7/Dockerfile* with `el7`)](https://github.com/openresty/docker-openresty/blob/master/centos7/Dockerfile)
108105
- [`fedora`, `fedora-rpm`, (*fedora/Dockerfile* with `fc36`)](https://github.com/openresty/docker-openresty/blob/master/fedora/Dockerfile)
109106
- [`rocky`, (*fedora/Dockerfile* with `rockylinux`)](https://github.com/openresty/docker-openresty/blob/master/fedora/Dockerfile)
110107
- [`windows`, (*windows/Dockerfile*)](https://github.com/openresty/docker-openresty/blob/master/windows/Dockerfile)
@@ -114,8 +111,6 @@ The following "flavors" are built from source and are intended for more advanced
114111
- [`alpine-fat`, (*alpine/Dockerfile.fat*)](https://github.com/openresty/docker-openresty/blob/master/alpine/Dockerfile.fat)
115112
- [`alpine`, (*alpine/Dockerfile*)](https://github.com/openresty/docker-openresty/blob/master/alpine/Dockerfile)
116113
- [`alpine-slim`, (*alpine/Dockerfile*](https://github.com/openresty/docker-openresty/blob/master/alpine/Dockerfile), stripped Alpine image)
117-
- [`bionic`, (*bionic/Dockerfile*)](https://github.com/openresty/docker-openresty/blob/master/bionic/Dockerfile)
118-
- [`focal`, (*focal/Dockerfile*)](https://github.com/openresty/docker-openresty/blob/master/focal/Dockerfile)
119114
- [`jammy`, (*jammy/Dockerfile*)](https://github.com/openresty/docker-openresty/blob/master/jammy/Dockerfile)
120115
- [`noble`, (*noble/Dockerfile*)](https://github.com/openresty/docker-openresty/blob/master/noble/Dockerfile)
121116

@@ -321,12 +316,12 @@ Docker CMD
321316

322317
The `-g "daemon off;"` directive is used in the Dockerfile CMD to keep the Nginx daemon running after container creation. If this directive is added to the nginx.conf, then the `docker run` should explicitly invoke `openresty` (or `nginx` for `windows` images):
323318
```
324-
docker run [options] openresty/openresty:bionic openresty
319+
docker run [options] openresty/openresty:noble openresty
325320
```
326321

327322
Invoke another CMD, for example the `resty` utility, like so:
328323
```
329-
docker run [options] openresty/openresty:bionic resty [script.lua]
324+
docker run [options] openresty/openresty:noble resty [script.lua]
330325
```
331326

332327
*NOTE* The `alpine` images do not include the packages `perl` and `ncurses`, which is needed by the `resty` utility.

Taskfile.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +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 amzn2-aarch64 -f centos/Dockerfile --build-arg RESTY_IMAGE_BASE=amazonlinux --build-arg RESTY_IMAGE_TAG=2 --build-arg RESTY_YUM_REPO="https://openresty.org/package/amazon/openresty.repo" --build-arg RESTY_RPM_DIST="amzn2" --build-arg RESTY_RPM_ARCH="aarch64" .
2625
- 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" .
27-
- docker build -t centos-aarch64 -f centos/Dockerfile --build-arg RESTY_RPM_ARCH=aarch64 .
28-
- docker build -t centos7-aarch64 -f centos7/Dockerfile --build-arg RESTY_RPM_ARCH=aarch64 .
2926
- docker build -t fedora-aarch64 -f fedora/Dockerfile --build-arg RESTY_RPM_ARCH=aarch64 .
3027
- 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" .
3128
- docker build -t bullseye-aarch64 -f bullseye/Dockerfile --build-arg RESTY_APT_REPO="https://openresty.org/package/arm64/debian" .
3229

3330
build-all-upstream-amd64:
3431
cmds:
3532
- docker build -t alpine-apk-amd64 -f alpine-apk/Dockerfile .
36-
- docker build -t amzn2-amd64 -f centos/Dockerfile --build-arg RESTY_IMAGE_BASE=amazonlinux --build-arg RESTY_IMAGE_TAG=2 --build-arg RESTY_YUM_REPO="https://openresty.org/package/amazon/openresty.repo" --build-arg RESTY_RPM_DIST="amzn2" --build-arg RESTY_RPM_ARCH="x86_64" .
3733
- 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" .
38-
- docker build -t centos-amd64 -f centos/Dockerfile --build-arg RESTY_RPM_ARCH=x86_64 .
39-
- docker build -t centos7-amd64 -f centos7/Dockerfile --build-arg RESTY_RPM_ARCH=x86_64 .
4034
- docker build -t fedora-amd64 -f fedora/Dockerfile --build-arg RESTY_RPM_ARCH=x86_64 .
4135
- docker build -t bookworm-amd64 -f bookworm/Dockerfile --build-arg RESTY_APT_ARCH=amd64 .
4236
- docker build -t bullseye-amd64 -f bullseye/Dockerfile --build-arg RESTY_APT_ARCH=amd64 .
@@ -46,8 +40,6 @@ tasks:
4640
build-all-source-arm64:
4741
cmds:
4842
- docker build -t alpine-aarch64 -f alpine/Dockerfile .
49-
- docker build -t bionic-aarch64 -f bionic/Dockerfile .
50-
- docker build -t focal-aarch64 -f focal/Dockerfile .
5143
- docker build -t jammy-aarch64 -f jammy/Dockerfile .
5244
- docker build -t noble-aarch64 -f noble/Dockerfile .
5345

@@ -56,17 +48,13 @@ tasks:
5648
build-all-source-amd64:
5749
cmds:
5850
- docker build -t alpine-amd64 -f alpine/Dockerfile .
59-
- docker build -t bionic-amd64 -f bionic/Dockerfile .
60-
- docker build -t focal-amd64 -f focal/Dockerfile .
6151
- docker build -t jammy-amd64 -f jammy/Dockerfile .
6252
- docker build -t noble-amd64 -f noble/Dockerfile .
6353

6454
# Builds all source on host arch platform without tags
6555
build-all-source:
6656
cmds:
6757
- docker build -f alpine/Dockerfile .
68-
- docker build -f bionic/Dockerfile .
69-
- docker build -f focal/Dockerfile .
7058
- docker build -f jammy/Dockerfile .
7159
- docker build -f noble/Dockerfile .
7260

0 commit comments

Comments
 (0)