aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGalen Guyer <galen@galenguyer.com>2022-11-01 14:37:08 -0400
committerGalen Guyer <galen@galenguyer.com>2022-11-01 14:37:08 -0400
commit39936056155d197dc911933a89a70cdf1f178be7 (patch)
tree0f482fb3279f8a7923a979f9422811d550d265e7
parent7bc2fbb44b6f56986256673e7307d06bc8f27cc3 (diff)
Add check for jq, update nginx versions
-rw-r--r--README.md16
-rwxr-xr-xbake.sh6
2 files changed, 14 insertions, 8 deletions
diff --git a/README.md b/README.md
index 65dfa74..19a1f24 100644
--- a/README.md
+++ b/README.md
@@ -2,15 +2,15 @@
automatic builds of nginx with multiple architectures and rootless support
## tags
-- **alpine-mainline**: `latest`, `alpine`, `alpine3.16.2`, `mainline`, `mainline-alpine`, `mainline-alpine3.16.2`, `1.23.1`, `1.23.1-alpine`, `1.23.1-alpine3.16.2`
-- **alpine-mainline-autoindex**: `autoindex`, `alpine-autoindex`, `alpine3.16.2-autoindex`, `mainline-autoindex`, `mainline-alpine-autoindex`, `mainline-alpine3.16.2-autoindex`, `1.23.1-autoindex`, `1.23.1-alpine-autoindex`, `1.23.1-alpine3.16.2-autoindex`
-- **alpine-mainline-spa**: `spa`, `alpine-spa`, `alpine3.16.2-spa`, `mainline-spa`, `mainline-alpine-spa`, `mainline-alpine3.16.2-spa`, `1.23.1-spa`, `1.23.1-alpine-spa`, `1.23.1-alpine3.16.2-spa`
-- **alpine-stable**: `stable`, `stable-alpine`, `stable-alpine3.16.2`, `1.22.0`, `1.22.0-alpine`, `1.22.0-alpine3.16.2`
-- **alpine-stable-autoindex**: `stable-autoindex`, `stable-alpine-autoindex`, `stable-alpine3.16.2-autoindex`, `1.22.0-autoindex`, `1.22.0-alpine-autoindex`, `1.22.0-alpine3.16.2-autoindex`
-- **alpine-stable-spa**: `stable-spa`, `stable-alpine-spa`, `stable-alpine3.16.2-spa`, `1.22.0-spa`, `1.22.0-alpine-spa`, `1.22.0-alpine3.16.2-spa`
+- **alpine-mainline**: `latest`, `alpine`, `alpine3.16.2`, `mainline`, `mainline-alpine`, `mainline-alpine3.16.2`, `1.23.2`, `1.23.2-alpine`, `1.23.2-alpine3.16.2`
+- **alpine-mainline-autoindex**: `autoindex`, `alpine-autoindex`, `alpine3.16.2-autoindex`, `mainline-autoindex`, `mainline-alpine-autoindex`, `mainline-alpine3.16.2-autoindex`, `1.23.2-autoindex`, `1.23.2-alpine-autoindex`, `1.23.2-alpine3.16.2-autoindex`
+- **alpine-mainline-spa**: `spa`, `alpine-spa`, `alpine3.16.2-spa`, `mainline-spa`, `mainline-alpine-spa`, `mainline-alpine3.16.2-spa`, `1.23.2-spa`, `1.23.2-alpine-spa`, `1.23.2-alpine3.16.2-spa`
+- **alpine-stable**: `stable`, `stable-alpine`, `stable-alpine3.16.2`, `1.22.1`, `1.22.1-alpine`, `1.22.1-alpine3.16.2`
+- **alpine-stable-autoindex**: `stable-autoindex`, `stable-alpine-autoindex`, `stable-alpine3.16.2-autoindex`, `1.22.1-autoindex`, `1.22.1-alpine-autoindex`, `1.22.1-alpine3.16.2-autoindex`
+- **alpine-stable-spa**: `stable-spa`, `stable-alpine-spa`, `stable-alpine3.16.2-spa`, `1.22.1-spa`, `1.22.1-alpine-spa`, `1.22.1-alpine3.16.2-spa`
## build options
- **ALPINE**: `3.16.2`
-- **NGINX_MAINLINE**: `1.23.1`
-- **NGINX_STABLE**: `1.22.0`
+- **NGINX_MAINLINE**: `1.23.2`
+- **NGINX_STABLE**: `1.22.1`
- **PCRE2**: `pcre2-10.40`
diff --git a/bake.sh b/bake.sh
index 2ea23fa..bc188db 100755
--- a/bake.sh
+++ b/bake.sh
@@ -14,6 +14,12 @@ else
exit 1
fi
+# check for jq
+if ! command -v jq 2>&1 >/dev/null; then
+ echo "could not find jq, exiting" >&2
+ exit 1
+fi
+
# if no registry is provided, tag image as "local" registry
registry="${REGISTRY:-local}"
echo "using registry $registry..." >&2