From 9f4554ffd3b3eda1d16bcb06ea5a90293ea83153 Mon Sep 17 00:00:00 2001
From: Galen Guyer <galen@galenguyer.com>
Date: Wed, 7 Dec 2022 15:43:59 -0500
Subject: Properly use PCRE2 version

---
 bake.sh         | 2 +-
 docker-bake.hcl | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bake.sh b/bake.sh
index bc188db..b946f23 100755
--- a/bake.sh
+++ b/bake.sh
@@ -37,7 +37,7 @@ nginx_mainline="${NGINX_MAINLINE:-$(curl -sSL https://nginx.org/en/download.html
 echo "using nginx mainline version $nginx_mainline..." >&2
 
 # retrieve latest pcre2 version
-pcre="${PCRE:-$(curl -sSL https://api.github.com/repos/PCRE2Project/pcre2/releases/latest | jq -r '.name')}"
+pcre="${PCRE:-$(curl -sSL https://api.github.com/repos/PCRE2Project/pcre2/releases/latest | jq -r '.tag_name')}"
 echo "using pcre2 version $pcre..." >&2
 
 # pass core count into container for build process
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 04eedf1..2ec4674 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,6 +1,7 @@
 variable "ALPINE_VER" { default = "UNSET" }
 variable "NGINX_MAINLINE" { default = "UNSET" }
 variable "NGINX_STABLE" { default = "UNSET" }
+variable "PCRE2_VER" { default = "UNSET" }
 variable "CORE_COUNT" { default = "1" }
 variable "REGISTRY" { default = "local" }
 
@@ -25,6 +26,7 @@ target "alpine-mainline" {
     args = {
         ALPINE_VER="${ALPINE_VER}"
         NGINX_VER="${NGINX_MAINLINE}"
+	PCRE2_VER="${PCRE2_VER}"
         CORE_COUNT="${CORE_COUNT}"
     }
     platforms = ["linux/amd64", "linux/386", "linux/arm/v6", "linux/arm/v7", "linux/arm64"]
@@ -46,6 +48,7 @@ target "alpine-stable" {
     args = {
         ALPINE_VER="${ALPINE_VER}"
         NGINX_VER="${NGINX_STABLE}"
+	PCRE2_VER="${PCRE2_VER}"
         CORE_COUNT="${CORE_COUNT}"
     }
     platforms = ["linux/amd64", "linux/386", "linux/arm/v6", "linux/arm/v7", "linux/arm64"]
@@ -64,6 +67,7 @@ target "alpine-mainline-spa" {
     args = {
         ALPINE_VER="${ALPINE_VER}"
         NGINX_VER="${NGINX_MAINLINE}"
+	PCRE2_VER="${PCRE2_VER}"
         CORE_COUNT="${CORE_COUNT}"
     }
     platforms = ["linux/amd64", "linux/386", "linux/arm/v6", "linux/arm/v7", "linux/arm64"]
@@ -85,6 +89,7 @@ target "alpine-stable-spa" {
     args = {
         ALPINE_VER="${ALPINE_VER}"
         NGINX_VER="${NGINX_STABLE}"
+	PCRE2_VER="${PCRE2_VER}"
         CORE_COUNT="${CORE_COUNT}"
     }
     platforms = ["linux/amd64", "linux/386", "linux/arm/v6", "linux/arm/v7", "linux/arm64"]
@@ -103,6 +108,7 @@ target "alpine-mainline-autoindex" {
     args = {
         ALPINE_VER="${ALPINE_VER}"
         NGINX_VER="${NGINX_MAINLINE}"
+	PCRE2_VER="${PCRE2_VER}"
         CORE_COUNT="${CORE_COUNT}"
     }
     platforms = ["linux/amd64", "linux/386", "linux/arm/v6", "linux/arm/v7", "linux/arm64"]
@@ -124,6 +130,7 @@ target "alpine-stable-autoindex" {
     args = {
         ALPINE_VER="${ALPINE_VER}"
         NGINX_VER="${NGINX_STABLE}"
+	PCRE2_VER="${PCRE2_VER}"
         CORE_COUNT="${CORE_COUNT}"
     }
     platforms = ["linux/amd64", "linux/386", "linux/arm/v6", "linux/arm/v7", "linux/arm64"]
-- 
cgit v1.2.3