From 39936056155d197dc911933a89a70cdf1f178be7 Mon Sep 17 00:00:00 2001 From: Galen Guyer Date: Tue, 1 Nov 2022 14:37:08 -0400 Subject: Add check for jq, update nginx versions --- README.md | 16 ++++++++-------- bake.sh | 6 ++++++ 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 -- cgit v1.2.3