openresty / docker-openresty

Docker tooling for OpenResty
https://hub.docker.com/r/openresty/openresty
BSD 2-Clause "Simplified" License
935 stars 525 forks source link

bump alpine from 3.16 to 3.17 #224

Closed fengshunli closed 1 year ago

neomantra commented 1 year ago

Thanks -- I'll merge this once you add the following:

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 ## untagged

  * Added `centos/Dockerfile.expat_example` of installing expat from source (#221)
+ * Upgraded Alpine to `3.17` for `alpine` not `alpine-apk` (#224)

 ## 1.21.4.1-5

diff --git a/README.md b/README.md
index 2de72ec..f622236 100644
--- a/README.md
+++ b/README.md
@@ -297,7 +297,7 @@ docker build --build-arg RESTY_J=4 -f jammy/Dockerfile .
 | Key                                     | Default | Description |
 :-----------------------------------------| :-----: |:----------- |
 | RESTY_IMAGE_BASE                        | "ubuntu" / "alpine" | The Debian or Alpine Docker image base to build `FROM`. |
-| RESTY_IMAGE_TAG                         | "jammy" / "3.16" | The Debian or Alpine Docker image tag to build `FROM`. |
+| RESTY_IMAGE_TAG                         | "jammy" / "3.17" | The Debian or Alpine Docker image tag to build `FROM`. |
 | RESTY_VERSION                           | 1.21.4.1 | The version of OpenResty to use. |
 | RESTY_LUAROCKS_VERSION                  | 3.9.0 | The version of LuaRocks to use. |
 | RESTY_OPENSSL_VERSION                   | 1.1.1q | The version of OpenSSL to use. |
fengshunli commented 1 year ago

done @neomantra

neomantra commented 1 year ago

OK, this is on master, thanks!