From 60b504da0c7e9e8b4e7dd1fdc5dea7852e4561e1 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Sat, 7 Jun 2025 22:10:06 +0200 Subject: [PATCH] asfd --- entrypoint.sh | 17 ++++++++--------- renovate.json | 6 +++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 4b1cb7f..57e2544 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -44,14 +44,14 @@ if [[ "${PLUGIN_PLATFORM:-}" == "true" ]]; then COMMAND="$COMMAND --opt platform='$PLUGIN_PLATFORM'" fi # https://github.com/moby/buildkit/blob/master/README.md#output -BUILDCTL_OUTPUT="" +OUTPUT="" if [[ -n "${PLUGIN_NAME:-}" ]]; then - BUILDCTL_OUTPUT="$BUILDCTL_OUTPUT --output type=image,\"name=$PLUGIN_NAME\",push=${PLUGIN_PUSH:-true}" - BUILDCTL_OUTPUT="$BUILDCTL_OUTPUT,oci-mediatypes=true,oci-artifact=true,compression=estargz,compression-level=9" - BUILDCTL_OUTPUT="$BUILDCTL_OUTPUT,rewrite-timestamp=true" - BUILDCTL_OUTPUT="$BUILDCTL_OUTPUT$(echo "$PLUGIN_ANNOTATION" | jq --join-output 'keys[] as $k|",annotation.\($k)=\"\(.[$k])\""')" + OUTPUT="$OUTPUT --output type=image,\"name=$PLUGIN_NAME\",push=${PLUGIN_PUSH:-true}" + OUTPUT="$OUTPUT,oci-mediatypes=true,oci-artifact=true,compression=estargz,compression-level=9" + OUTPUT="$OUTPUT,rewrite-timestamp=true" + OUTPUT="$OUTPUT$(echo "$PLUGIN_ANNOTATION" | jq --join-output 'keys[] as $k|",annotation.\($k)=\"\(.[$k])\""')" fi -COMMAND="$COMMAND $BUILDCTL_OUTPUT" +COMMAND="$COMMAND $OUTPUT" # custom args, e.g. docker run --rm --volume=$HOME:HOME:ro --workdir=$PWD kokuwaio/buildkit --opt buildarg=foo=bar if [[ -n "${1:-}" ]]; then @@ -70,8 +70,8 @@ echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH docker buildx build ${PLUGIN_CONTEXT: if [[ "${PLUGIN_PLATFORM:-}" == "true" ]]; then echo " --platform='$PLUGIN_PLATFORM'" fi -if [[ -n "${PLUGIN_ADDR:-}" ]]; then - echo " $BUILDCTL_OUTPUT" +if [[ -n "${OUTPUT:-}" ]]; then + echo " $OUTPUT" fi echo echo Running now: @@ -79,4 +79,3 @@ echo echo -n "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH ${COMMAND// --/\\n --}" echo eval "$COMMAND" -echo 1 diff --git a/renovate.json b/renovate.json index 5fad364..652b74c 100644 --- a/renovate.json +++ b/renovate.json @@ -52,10 +52,10 @@ "packageNameTemplate": "moby/buildkit" },{ "customType": "regex", - "managerFilePatterns": ["Dockerfile", ".woodpecker/build.yaml"], - "matchStrings": ["https://github.com/jqlang/jq/releases/download/(?jq-[0-9]+\\.[0-9]+\\.[0-9]+)/jq-linux-$SUFFIX"], + "managerFilePatterns": ["Dockerfile"], + "matchStrings": ["https://github.com/jqlang/jq/releases/download/(?jq\\-[0-9]+\\.[0-9]+\\.[0-9]+)/jq-linux-$SUFFIX"], "datasourceTemplate": "github-tags", "packageNameTemplate": "qlang/jq" } ] -} +