From 7fcec51f770181845e435363b46db5737c6435a6 Mon Sep 17 00:00:00 2001
From: Stephan Schnabel <stephan@schnabel.org>
Date: Sat, 7 Jun 2025 19:16:02 +0200
Subject: [PATCH] ser

---
 Dockerfile    | 3 +--
 entrypoint.sh | 6 +++---
 renovate.json | 9 ++++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 80fabf9..eed755c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
 FROM docker.io/library/bash:5.2.37@sha256:01a15c6f48f6a3c08431cd77e11567823530b18159889dca3b7309b707beef91
-SHELL ["/usr/local/bin/bash", "-u", "-e", "-o", "pipefail", "-c"]
-RUN ARCH=$(uname -m) && \
+RUN set -o pipefail && ARCH=$(uname -m) && \
 	[[ $ARCH == x86_64 ]] && export SUFFIX=amd64; \
 	[[ $ARCH == aarch64 ]] && export SUFFIX=arm64; \
 	[[ -z ${SUFFIX:-} ]] && echo "Unknown arch: $ARCH" && exit 1; \
diff --git a/entrypoint.sh b/entrypoint.sh
index 0540aad..d1f3c28 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -7,12 +7,12 @@ env | sort | grep -v DRONE
 ##
 
 BUILDKIT_HOST=${PLUGIN_ADDR:-${BUILDKIT_HOST:-}}
-if [[ -z "${BUILDCTL_ADDR:-}" ]]; then
+if [[ -z "${BUILDKIT_HOST:-}" ]]; then
 	echo "Missing buildkit addr."
 	exit 1
 fi
 BUILDCTL_CONTEXT=${PLUGIN_CONTEXT:-$(pwd)}
-BUILDCTL_DOCKERFILE=$(dirname ${PLUGIN_DOCKERFILE:-$BUILDCTL_CONTEXT/Dockerfile})
+BUILDCTL_DOCKERFILE=$(dirname "${PLUGIN_DOCKERFILE:-$BUILDCTL_CONTEXT/Dockerfile}")
 if [[ ! -f $BUILDCTL_DOCKERFILE/Dockerfile ]]; then
 	echo "Dockerfile $BUILDCTL_DOCKERFILE/Dockerfile not found!"
 	exit 1
@@ -30,7 +30,7 @@ SOURCE_DATE_EPOCH=${PLUGIN_SOURCE_DATE_EPOCH:-${SOURCE_DATE_EPOCH:-0}}
 ##
 
 COMMAND="buildctl"
-COMMAND="$COMMAND --addr $BUILDCTL_ADDR"
+COMMAND="$COMMAND --addr $BUILDKIT_HOST"
 COMMAND="$COMMAND build"
 COMMAND="$COMMAND --frontend $BUILDCTL_FRONTEND"
 COMMAND="$COMMAND --local context='$BUILDCTL_CONTEXT'"
diff --git a/renovate.json b/renovate.json
index 4a73a51..bc736bf 100644
--- a/renovate.json
+++ b/renovate.json
@@ -41,11 +41,10 @@
 			"customType": "regex",
 			"fileMatch": ["Dockerfile", ".woodpecker/build.yaml"],
 			"matchStrings": [
-				"https://github.com/moby/buildkit/releases/download/(?<currentValue>v[0-9]+\\.[0-9]+\\.[0-9]+)/buildkit-",
-				"/buildkit-(?<currentValue>v[0-9]+\\.[0-9]+\\.[0-9]+)\\.linux-",
-				"registry.kokuwa.io/buildctl:(?<currentValue>v[0-9]+\\.[0-9]+\\.[0-9]+)",
-				"docker.io/kokuwaio/buildctl:(?<currentValue>v[0-9]+\\.[0-9]+\\.[0-9]+)",
-				"ghcr.io/kokuwaio/buildctl:(?<currentValue>v[0-9]+\\.[0-9]+\\.[0-9]+)",
+				"- registry.kokuwa.io/buildctl:(?<currentValue>v[0-9]+\\.[0-9]+\\.[0-9]+)",
+				"- docker.io/kokuwaio/buildctl:(?<currentValue>v[0-9]+\\.[0-9]+\\.[0-9]+)",
+				"- ghcr.io/kokuwaio/buildctl:(?<currentValue>v[0-9]+\\.[0-9]+\\.[0-9]+)",
+				"github.com/moby/buildkit/releases/download/(?<currentValue>v[0-9]+\\.[0-9]+\\.[0-9]+)/buildkit-(?<currentValue>v[0-9]+\\.[0-9]+\\.[0-9]+).linux-$SUFFIX.tar.gz",
 				"org.opencontainers.image.version: (?<currentValue>v[0-9]+\\.[0-9]+\\.[0-9]+)"
 			],
 			"datasourceTemplate": "github-tags",