Skip to content

Commit f14ad1b

Browse files
committed
Upgrade OpenResty to 1.27.1.2 and OpenSSL to 3.4.1
Signed-off-by: Evan Wies <evan@neomantra.net>
1 parent 834bc25 commit f14ad1b

22 files changed

+61
-56
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Changelog
22
=========
33

4+
## 1.27.1.2-0 (2025-03-31)
5+
6+
* Upgrade OpenResty to 1.27.1.2
7+
* Upgrade OpenSSL to 3.4.1
8+
49
## 1.27.1.1-4 (2025-03-31)
510

611
* Add `bookworm-buildpack` flavor. ([#267](https://github.com/openresty/docker-openresty/issues/267))

README.md

+14-14
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ It is best practice to pin your images to an explicit image tag. The [next sect
1515

1616
| Image | Description |
1717
| --- | --- |
18-
| `openresty/openresty:1.27.1.1-0-jammy` | Built-from-source Ubuntu Jammy |
19-
| `openresty/openresty:1.27.1.1-0-focal` | Built-from-source Ubuntu Focal |
20-
| `openresty/openresty:1.27.1.1-0-bookworm-fat` | Built-from-upstream Debian Bookworm |
21-
| `openresty/openresty:1.27.1.1-0-alpine` | Built-from-source Alpine |
22-
| `openresty/openresty:1.27.1.1-0-alpine-apk` | Built-from-upstream Alpine |
18+
| `openresty/openresty:1.27.1.2-0-jammy` | Built-from-source Ubuntu Jammy |
19+
| `openresty/openresty:1.27.1.2-0-focal` | Built-from-source Ubuntu Focal |
20+
| `openresty/openresty:1.27.1.2-0-bookworm-fat` | Built-from-upstream Debian Bookworm |
21+
| `openresty/openresty:1.27.1.2-0-alpine` | Built-from-source Alpine |
22+
| `openresty/openresty:1.27.1.2-0-alpine-apk` | Built-from-upstream Alpine |
2323

2424
These are examples of untagged image names, for reference:
2525

@@ -351,10 +351,10 @@ docker build --build-arg RESTY_J=4 -f jammy/Dockerfile .
351351
|:-----------------------------------------| :-----: |:----------- |
352352
| RESTY_IMAGE_BASE | "ubuntu" / "alpine" | The Debian or Alpine Docker image base to build `FROM`. |
353353
| RESTY_IMAGE_TAG | "noble" / "3.21.3" | The Debian or Alpine Docker image tag to build `FROM`. |
354-
| RESTY_VERSION | 1.27.1.1 | The version of OpenResty to use. |
354+
| RESTY_VERSION | 1.27.1.2 | The version of OpenResty to use. |
355355
| RESTY_LUAROCKS_VERSION | 3.11.1 | The version of LuaRocks to use. |
356-
| RESTY_OPENSSL_VERSION | 3.0.16 | The version of OpenSSL to use. |
357-
| RESTY_OPENSSL_PATCH_VERSION | 3.0.15 | The version of OpenSSL to use when patching. |
356+
| RESTY_OPENSSL_VERSION | 3.4.1 | The version of OpenSSL to use. |
357+
| RESTY_OPENSSL_PATCH_VERSION | 3.4.1 | The version of OpenSSL to use when patching. |
358358
| RESTY_OPENSSL_URL_BASE | "https://github.com/openssl/openssl/releases/download/openssl-${RESTY_OPENSSL_VERSION}" | The base of the URL to download OpenSSL from. |
359359
| RESTY_OPENSSL_BUILD_OPTIONS | "enable-camellia enable-seed enable-rfc3779 enable-cms enable-md2 enable-rc5 enable-weak-ssl-ciphers enable-ssl3 enable-ssl3-method enable-md2 enable-ktls enable-fips" | Options to tweak Resty's OpenSSL build. |
360360
| RESTY_PCRE_VERSION | 10.44 | The version of PCRE2 to use. |
@@ -435,7 +435,7 @@ docker build --build-arg RESTY_RPM_FLAVOR="-debug" -f fedora/Dockerfile .
435435
|RESTY_LUAROCKS_VERSION | 3.11.1 | The version of LuaRocks to use. |
436436
|RESTY_YUM_REPO | "https://openresty.org/package/centos/openresty.repo" | URL for the OpenResty YUM Repository. |
437437
|RESTY_RPM_FLAVOR | "" | The `openresty` package flavor to use. Possibly `"-debug"` or `"-valgrind"`. |
438-
|RESTY_RPM_VERSION | "1.27.1.1-1" | The `openresty` package version to install. |
438+
|RESTY_RPM_VERSION | "1.27.1.2-1" | The `openresty` package version to install. |
439439
|RESTY_RPM_DIST | "el8" | The `openresty` package distribution to install. |
440440
|RESTY_RPM_ARCH | "x86_64" | The `openresty` package architecture to install. |
441441

@@ -468,9 +468,9 @@ docker build --build-arg RESTY_DEB_FLAVOR="-debug" -f bullseye/Dockerfile .
468468
|RESTY_IMAGE_BASE | "debian" | The Debian Docker image base to build `FROM`. |
469469
|RESTY_IMAGE_TAG | "bullseye-slim" | The Debian Docker image tag to build `FROM`. |
470470
|RESTY_DEB_FLAVOR | "" | The `openresty` package flavor to use. Possibly `"-debug"` or `"-valgrind"`. |
471-
|RESTY_DEB_VERSION | "=1.27.1.1-1~bookworm1" | The [Debian package version](https://openresty.org/package/debian/pool/openresty/o/openresty/) to use, with `=` prepended. |
471+
|RESTY_DEB_VERSION | "=1.27.1.2-1~bookworm1" | The [Debian package version](https://openresty.org/package/debian/pool/openresty/o/openresty/) to use, with `=` prepended. |
472472
|RESTY_FAT_DEB_FLAVOR | "" | The `openresty` package flavor to use to install "fat" packages. Possibly `"-debug"` or `"-valgrind"`. |
473-
|RESTY_FAT_DEB_VERSION | "=1.27.1.1-1~bookworm1" | The [Debian package version](https://openresty.org/package/debian/pool/openresty/o/openresty/) to use to "fat" packages, with `=` prepended. |
473+
|RESTY_FAT_DEB_VERSION | "=1.27.1.2-1~bookworm1" | The [Debian package version](https://openresty.org/package/debian/pool/openresty/o/openresty/) to use to "fat" packages, with `=` prepended. |
474474

475475
* For `amd64` builds, `RESTY_APT_REPO="https://openresty.org/package/debian"`
476476
* For `arm64` builds, `RESTY_APT_REPO="https://openresty.org/package/arm64/debian"`
@@ -500,7 +500,7 @@ docker build --build-arg RESTY_IMAGE_TAG="3.12" -f alpine-apk/Dockerfile .
500500
|RESTY_APK_ALPINE_VERSION | "3.18" | The Alpine version for RESTY_APK_REPO_URL. |
501501
|RESTY_APK_KEY_URL | "https://openresty.org/package/admin@openresty.com-5ea678a6.rsa.pub" | The URL of the signing key of the `openresty` package. |
502502
|RESTY_APK_REPO_URL | "https://openresty.org/package/alpine/v${RESTY_APK_ALPINE_VERSION}/main" | The URL of the APK repository for `openresty` package. |
503-
|RESTY_APK_VERSION | "=1.27.1.1-r0" | The suffix to add to the apk install package name: `openresty${RESTY_APK_VERSION`}. |
503+
|RESTY_APK_VERSION | "=1.27.1.2-r0" | The suffix to add to the apk install package name: `openresty${RESTY_APK_VERSION`}. |
504504

505505
[Back to TOC](#table-of-contents)
506506

@@ -515,7 +515,7 @@ This Docker image can be built and customized by cloning the repo and running `d
515515
The following are the available build-time options. They can be set using the `--build-arg` CLI argument, like so:
516516

517517
```
518-
docker build --build-arg RESTY_VERSION="1.27.1.1" -f windows/Dockerfile .
518+
docker build --build-arg RESTY_VERSION="1.27.1.2" -f windows/Dockerfile .
519519
```
520520

521521
| Key | Default | Description |
@@ -524,7 +524,7 @@ docker build --build-arg RESTY_VERSION="1.27.1.1" -f windows/Dockerfile .
524524
|RESTY_INSTALL_TAG | "4.8-windowsservercore-ltsc2019" | The Windows Server Docker image name to download and install OpenResty with. |
525525
|RESTY_IMAGE_BASE | "mcr.microsoft.com/windows/nanoserver" | The Windows Server Docker image name to build `FROM` for final image. |
526526
|RESTY_IMAGE_TAG | "1809" | The Windows Server Docker image tag to build `FROM` for final image. |
527-
|RESTY_VERSION | 1.27.1.1 | The version of OpenResty to use. |
527+
|RESTY_VERSION | 1.27.1.2 | The version of OpenResty to use. |
528528

529529
[Back to TOC](#table-of-contents)
530530

alpine-apk/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ARG RESTY_IMAGE_TAG="3.18.12"
1515
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.27.1.1-r0"
18+
ARG RESTY_APK_VERSION="=1.27.1.2-r0"
1919

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

alpine/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
1111
# Docker Build Arguments
1212
ARG RESTY_IMAGE_BASE="alpine"
1313
ARG RESTY_IMAGE_TAG="3.21.3"
14-
ARG RESTY_VERSION="1.27.1.1"
14+
ARG RESTY_VERSION="1.27.1.2"
1515

1616
# https://github.com/openresty/openresty-packaging/blob/master/alpine/openresty-openssl3/APKBUILD
17-
ARG RESTY_OPENSSL_VERSION="3.0.16"
18-
ARG RESTY_OPENSSL_PATCH_VERSION="3.0.15"
17+
ARG RESTY_OPENSSL_VERSION="3.4.1"
18+
ARG RESTY_OPENSSL_PATCH_VERSION="3.4.1"
1919
ARG RESTY_OPENSSL_URL_BASE="https://github.com/openssl/openssl/releases/download/openssl-${RESTY_OPENSSL_VERSION}"
2020
# LEGACY: "https://www.openssl.org/source/old/1.1.1"
2121
ARG RESTY_OPENSSL_BUILD_OPTIONS="enable-camellia enable-seed enable-rfc3779 enable-cms enable-md2 enable-rc5 \
@@ -135,8 +135,8 @@ RUN apk add --no-cache --virtual .build-deps \
135135
&& curl -fSL "${RESTY_OPENSSL_URL_BASE}/openssl-${RESTY_OPENSSL_VERSION}.tar.gz" -o openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
136136
&& tar xzf openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
137137
&& cd openssl-${RESTY_OPENSSL_VERSION} \
138-
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-4) = "3.0." ] ; then \
139-
echo 'patching OpenSSL 3.0.15 for OpenResty' \
138+
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-2) = "3." ] ; then \
139+
echo 'patching OpenSSL 3.x for OpenResty' \
140140
&& curl -s https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-${RESTY_OPENSSL_PATCH_VERSION}-sess_set_get_cb_yield.patch | patch -p1 ; \
141141
fi \
142142
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-5) = "1.1.1" ] ; then \

bionic/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
1111
# Docker Build Arguments
1212
ARG RESTY_IMAGE_BASE="ubuntu"
1313
ARG RESTY_IMAGE_TAG="bionic"
14-
ARG RESTY_VERSION="1.27.1.1"
14+
ARG RESTY_VERSION="1.27.1.2"
1515
ARG RESTY_LUAROCKS_VERSION="3.11.1"
1616

1717
# https://github.com/openresty/openresty-packaging/blob/master/deb/openresty-openssl3/debian/rules
18-
ARG RESTY_OPENSSL_VERSION="3.0.16"
19-
ARG RESTY_OPENSSL_PATCH_VERSION="3.0.15"
18+
ARG RESTY_OPENSSL_VERSION="3.4.1"
19+
ARG RESTY_OPENSSL_PATCH_VERSION="3.4.1"
2020
ARG RESTY_OPENSSL_URL_BASE="https://github.com/openssl/openssl/releases/download/openssl-${RESTY_OPENSSL_VERSION}"
2121
# LEGACY: "https://www.openssl.org/source/old/1.1.1"
2222
ARG RESTY_OPENSSL_BUILD_OPTIONS="enable-camellia enable-seed enable-rfc3779 enable-cms enable-md2 enable-rc5 \
@@ -135,8 +135,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
135135
&& curl -fSL "${RESTY_OPENSSL_URL_BASE}/openssl-${RESTY_OPENSSL_VERSION}.tar.gz" -o openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
136136
&& tar xzf openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
137137
&& cd openssl-${RESTY_OPENSSL_VERSION} \
138-
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-4) = "3.0." ] ; then \
139-
echo 'patching OpenSSL 3.0.15 for OpenResty' \
138+
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-2) = "3." ] ; then \
139+
echo 'patching OpenSSL 3.x for OpenResty' \
140140
&& curl -s https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-${RESTY_OPENSSL_PATCH_VERSION}-sess_set_get_cb_yield.patch | patch -p1 ; \
141141
fi \
142142
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-5) = "1.1.1" ] ; then \

bookworm/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
1212
# OpenResty Debian package variants.
1313
# For example: "-debug" or "-valgrind"
1414
ARG RESTY_DEB_FLAVOR=""
15-
ARG RESTY_DEB_VERSION="=1.27.1.1-1~bookworm1"
15+
ARG RESTY_DEB_VERSION="=1.27.1.2-1~bookworm1"
1616
ARG RESTY_APT_REPO="https://openresty.org/package/debian"
1717
ARG RESTY_APT_PGP="https://openresty.org/package/pubkey.gpg"
1818
ARG RESTY_APT_ARCH="amd64"

bookworm/Dockerfile.buildpack

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
1212
# OpenResty Debian package variants.
1313
# For example: "-debug" or "-valgrind"
1414
ARG RESTY_DEB_FLAVOR=""
15-
ARG RESTY_DEB_VERSION="=1.27.1.1-1~bookworm1"
15+
ARG RESTY_DEB_VERSION="=1.27.1.2-1~bookworm1"
1616
ARG RESTY_APT_REPO="https://openresty.org/package/debian"
1717
ARG RESTY_APT_PGP="https://openresty.org/package/pubkey.gpg"
1818
ARG RESTY_APT_ARCH="amd64"

bookworm/Dockerfile.fat

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ARG RESTY_FAT_IMAGE_TAG="bookworm"
1919
# OpenResty Debian package variants.
2020
# For example: "-debug" or "-valgrind"
2121
ARG RESTY_FAT_DEB_FLAVOR=""
22-
ARG RESTY_FAT_DEB_VERSION="=1.27.1.1-1~bookworm1"
22+
ARG RESTY_FAT_DEB_VERSION="=1.27.1.2-1~bookworm1"
2323

2424
LABEL maintainer="Evan Wies <evan@neomantra.net>"
2525
LABEL resty_fat_deb_flavor="${RESTY_FAT_DEB_FLAVOR}"

bullseye/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
1212
# OpenResty Debian package variants.
1313
# For example: "-debug" or "-valgrind"
1414
ARG RESTY_DEB_FLAVOR=""
15-
ARG RESTY_DEB_VERSION="=1.27.1.1-1~bullseye1"
15+
ARG RESTY_DEB_VERSION="=1.27.1.2-1~bullseye1"
1616
ARG RESTY_APT_REPO="https://openresty.org/package/debian"
1717
ARG RESTY_APT_PGP="https://openresty.org/package/pubkey.gpg"
1818
ARG RESTY_IMAGE_BASE="debian"

bullseye/Dockerfile.debug

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
1212
# OpenResty Debian package variants.
1313
# For example: "-debug" or "-valgrind"
1414
ARG RESTY_DEB_FLAVOR="-debug"
15-
ARG RESTY_DEB_VERSION="=1.27.1.1-1~bullseye1"
15+
ARG RESTY_DEB_VERSION="=1.27.1.2-1~bullseye1"
1616
ARG RESTY_APT_REPO="https://openresty.org/package/debian"
1717
ARG RESTY_APT_PGP="https://openresty.org/package/pubkey.gpg"
1818
ARG RESTY_IMAGE_BASE="debian"

bullseye/Dockerfile.fat

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ARG RESTY_FAT_IMAGE_TAG="bullseye"
1919
# OpenResty Debian package variants.
2020
# For example: "-debug" or "-valgrind"
2121
ARG RESTY_FAT_DEB_FLAVOR=""
22-
ARG RESTY_FAT_DEB_VERSION="=1.27.1.1-1~bullseye1"
22+
ARG RESTY_FAT_DEB_VERSION="=1.27.1.2-1~bullseye1"
2323

2424
LABEL maintainer="Evan Wies <evan@neomantra.net>"
2525
LABEL resty_fat_deb_flavor="${RESTY_FAT_DEB_FLAVOR}"

bullseye/Dockerfile.valgrind

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
1212
# OpenResty Debian package variants.
1313
# For example: "-debug" or "-valgrind"
1414
ARG RESTY_DEB_FLAVOR="-valgrind"
15-
ARG RESTY_DEB_VERSION="=1.27.1.1-1~bullseye1"
15+
ARG RESTY_DEB_VERSION="=1.27.1.2-1~bullseye1"
1616
ARG RESTY_APT_REPO="https://openresty.org/package/debian"
1717
ARG RESTY_APT_PGP="https://openresty.org/package/pubkey.gpg"
1818
ARG RESTY_IMAGE_BASE="debian"

buster/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
1212
# OpenResty Debian package variants.
1313
# For example: "-debug" or "-valgrind"
1414
ARG RESTY_DEB_FLAVOR=""
15-
ARG RESTY_DEB_VERSION="=1.27.1.1-1~buster1"
15+
ARG RESTY_DEB_VERSION="=1.27.1.2-1~buster1"
1616
ARG RESTY_APT_REPO="https://openresty.org/package/debian"
1717
ARG RESTY_APT_PGP="https://openresty.org/package/pubkey.gpg"
1818
ARG RESTY_IMAGE_BASE="debian"

buster/Dockerfile.fat

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ARG RESTY_FAT_IMAGE_TAG="buster"
1919
# OpenResty Debian package variants.
2020
# For example: "-debug" or "-valgrind"
2121
ARG RESTY_FAT_DEB_FLAVOR=""
22-
ARG RESTY_FAT_DEB_VERSION="=1.27.1.1-1~buster1"
22+
ARG RESTY_FAT_DEB_VERSION="=1.27.1.2-1~buster1"
2323

2424
LABEL maintainer="Evan Wies <evan@neomantra.net>"
2525
LABEL resty_fat_deb_flavor="${RESTY_FAT_DEB_FLAVOR}"

centos/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARG RESTY_IMAGE_TAG="8"
1313
ARG RESTY_LUAROCKS_VERSION="3.11.1"
1414
ARG RESTY_YUM_REPO="https://openresty.org/package/centos/openresty.repo"
1515
ARG RESTY_RPM_FLAVOR=""
16-
ARG RESTY_RPM_VERSION="1.27.1.1-1"
16+
ARG RESTY_RPM_VERSION="1.27.1.2-1"
1717
ARG RESTY_RPM_DIST="el8"
1818
ARG RESTY_RPM_ARCH="x86_64"
1919

centos/Dockerfile.expat_example

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ARG OPENRESTY_VERSION="1.27.1.1-0"
1+
ARG OPENRESTY_VERSION="1.27.1.2-0"
22
FROM "openresty/openresty:${OPENRESTY_VERSION}-centos" # locally I needed to add "-aarch64"
3-
ARG OPENRESTY_VERSION="1.27.1.1-0"
3+
ARG OPENRESTY_VERSION="1.27.1.2-0"
44

55
# Install dependencies
66
RUN yum -y install gcc

centos7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARG RESTY_IMAGE_TAG="7"
1313
ARG RESTY_LUAROCKS_VERSION="3.11.1"
1414
ARG RESTY_YUM_REPO="https://openresty.org/package/centos/openresty.repo"
1515
ARG RESTY_RPM_FLAVOR=""
16-
ARG RESTY_RPM_VERSION="1.27.1.1-1"
16+
ARG RESTY_RPM_VERSION="1.27.1.2-1"
1717
ARG RESTY_RPM_DIST="el7"
1818
ARG RESTY_RPM_ARCH="x86_64"
1919

fedora/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARG RESTY_IMAGE_TAG="36"
1313
ARG RESTY_LUAROCKS_VERSION="3.11.1"
1414
ARG RESTY_YUM_REPO="https://openresty.org/package/fedora/openresty.repo"
1515
ARG RESTY_RPM_FLAVOR=""
16-
ARG RESTY_RPM_VERSION="1.27.1.1-1"
16+
ARG RESTY_RPM_VERSION="1.27.1.2-1"
1717
ARG RESTY_RPM_DIST="fc36"
1818
ARG RESTY_RPM_ARCH="x86_64"
1919

focal/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
1111
# Docker Build Arguments
1212
ARG RESTY_IMAGE_BASE="ubuntu"
1313
ARG RESTY_IMAGE_TAG="focal"
14-
ARG RESTY_VERSION="1.27.1.1"
14+
ARG RESTY_VERSION="1.27.1.2"
1515
ARG RESTY_LUAROCKS_VERSION="3.11.1"
1616

1717
# https://github.com/openresty/openresty-packaging/blob/master/deb/openresty-openssl3/debian/rules
18-
ARG RESTY_OPENSSL_VERSION="3.0.16"
19-
ARG RESTY_OPENSSL_PATCH_VERSION="3.0.15"
18+
ARG RESTY_OPENSSL_VERSION="3.4.1"
19+
ARG RESTY_OPENSSL_PATCH_VERSION="3.4.1"
2020
ARG RESTY_OPENSSL_URL_BASE="https://github.com/openssl/openssl/releases/download/openssl-${RESTY_OPENSSL_VERSION}"
2121
# LEGACY: "https://www.openssl.org/source/old/1.1.1"
2222
ARG RESTY_OPENSSL_BUILD_OPTIONS="enable-camellia enable-seed enable-rfc3779 enable-cms enable-md2 enable-rc5 \
@@ -135,8 +135,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
135135
&& curl -fSL "${RESTY_OPENSSL_URL_BASE}/openssl-${RESTY_OPENSSL_VERSION}.tar.gz" -o openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
136136
&& tar xzf openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
137137
&& cd openssl-${RESTY_OPENSSL_VERSION} \
138-
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-4) = "3.0." ] ; then \
139-
echo 'patching OpenSSL 3.0.15 for OpenResty' \
138+
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-2) = "3." ] ; then \
139+
echo 'patching OpenSSL 3.x for OpenResty' \
140140
&& curl -s https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-${RESTY_OPENSSL_PATCH_VERSION}-sess_set_get_cb_yield.patch | patch -p1 ; \
141141
fi \
142142
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-5) = "1.1.1" ] ; then \

jammy/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
1111
# Docker Build Arguments
1212
ARG RESTY_IMAGE_BASE="ubuntu"
1313
ARG RESTY_IMAGE_TAG="jammy"
14-
ARG RESTY_VERSION="1.27.1.1"
14+
ARG RESTY_VERSION="1.27.1.2"
1515
ARG RESTY_LUAROCKS_VERSION="3.11.1"
1616

1717
# https://github.com/openresty/openresty-packaging/blob/master/deb/openresty-openssl3/debian/rules
18-
ARG RESTY_OPENSSL_VERSION="3.0.16"
19-
ARG RESTY_OPENSSL_PATCH_VERSION="3.0.15"
18+
ARG RESTY_OPENSSL_VERSION="3.4.1"
19+
ARG RESTY_OPENSSL_PATCH_VERSION="3.4.1"
2020
ARG RESTY_OPENSSL_URL_BASE="https://github.com/openssl/openssl/releases/download/openssl-${RESTY_OPENSSL_VERSION}"
2121
# LEGACY: "https://www.openssl.org/source/old/1.1.1"
2222
ARG RESTY_OPENSSL_BUILD_OPTIONS="enable-camellia enable-seed enable-rfc3779 enable-cms enable-md2 enable-rc5 \
@@ -135,8 +135,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
135135
&& curl -fSL "${RESTY_OPENSSL_URL_BASE}/openssl-${RESTY_OPENSSL_VERSION}.tar.gz" -o openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
136136
&& tar xzf openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
137137
&& cd openssl-${RESTY_OPENSSL_VERSION} \
138-
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-4) = "3.0." ] ; then \
139-
echo 'patching OpenSSL 3.0.15 for OpenResty' \
138+
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-2) = "3." ] ; then \
139+
echo 'patching OpenSSL 3.x for OpenResty' \
140140
&& curl -s https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-${RESTY_OPENSSL_PATCH_VERSION}-sess_set_get_cb_yield.patch | patch -p1 ; \
141141
fi \
142142
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-5) = "1.1.1" ] ; then \

noble/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
1111
# Docker Build Arguments
1212
ARG RESTY_IMAGE_BASE="ubuntu"
1313
ARG RESTY_IMAGE_TAG="noble"
14-
ARG RESTY_VERSION="1.27.1.1"
14+
ARG RESTY_VERSION="1.27.1.2"
1515
ARG RESTY_LUAROCKS_VERSION="3.11.1"
1616

1717
# https://github.com/openresty/openresty-packaging/blob/master/deb/openresty-openssl3/debian/rules
18-
ARG RESTY_OPENSSL_VERSION="3.0.16"
19-
ARG RESTY_OPENSSL_PATCH_VERSION="3.0.15"
18+
ARG RESTY_OPENSSL_VERSION="3.4.1"
19+
ARG RESTY_OPENSSL_PATCH_VERSION="3.4.1"
2020
ARG RESTY_OPENSSL_URL_BASE="https://github.com/openssl/openssl/releases/download/openssl-${RESTY_OPENSSL_VERSION}"
2121
# LEGACY: "https://www.openssl.org/source/old/1.1.1"
2222
ARG RESTY_OPENSSL_BUILD_OPTIONS="enable-camellia enable-seed enable-rfc3779 enable-cms enable-md2 enable-rc5 \
@@ -135,8 +135,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
135135
&& curl -fSL "${RESTY_OPENSSL_URL_BASE}/openssl-${RESTY_OPENSSL_VERSION}.tar.gz" -o openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
136136
&& tar xzf openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
137137
&& cd openssl-${RESTY_OPENSSL_VERSION} \
138-
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-4) = "3.0." ] ; then \
139-
echo 'patching OpenSSL 3.0.15 for OpenResty' \
138+
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-2) = "3." ] ; then \
139+
echo 'patching OpenSSL 3.x for OpenResty' \
140140
&& curl -s https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-${RESTY_OPENSSL_PATCH_VERSION}-sess_set_get_cb_yield.patch | patch -p1 ; \
141141
fi \
142142
&& if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-5) = "1.1.1" ] ; then \

0 commit comments

Comments
 (0)