From cae3115061d0a0e0804c48b2a02bb1ee4f677ca0 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Thu, 12 Jun 2025 14:18:22 +0200 Subject: [PATCH] 1 --- .woodpecker/build.yaml | 2 +- .woodpecker/test.yaml | 8 ++++---- Dockerfile | 1 + renovate.json | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index a1b9b86..4d298a2 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -12,7 +12,7 @@ steps: pull: true depends_on: [] settings: &settings - name: registry.kokuwa.io/buildctl:$CI_PIPELINE_NUMBER + name: registry.kokuwa.io/kokuwaio/buildctl:ci-${CI_PIPELINE_NUMBER} auth: registry.kokuwa.io: username: {from_secret: kokuwa_io_username} diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml index b096834..73201a0 100644 --- a/.woodpecker/test.yaml +++ b/.woodpecker/test.yaml @@ -15,14 +15,14 @@ labels: steps: pr: - image: registry.kokuwa.io/buildctl:$CI_PIPELINE_NUMBER + image: registry.kokuwa.io/kokuwaio/buildctl:ci-${CI_PIPELINE_NUMBER} pull: true commands: buildctl --version when: event: pull_request kokuwa.io: &version - image: kokuwa.io/buildctl + image: registry.kokuwa.io/kokuwaio/buildctl:latest pull: true commands: buildctl --version when: @@ -30,9 +30,9 @@ steps: branch: main docker.io: - image: docker.io/kokuwaio/buildctl + image: docker.io/kokuwaio/buildctl:latest <<: *version ghcr.io: - image: ghcr.io/kokuwaio/buildctl + image: ghcr.io/kokuwaio/buildctl:latest <<: *version diff --git a/Dockerfile b/Dockerfile index ea76470..988b464 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ # bash is non-default location https://github.com/tianon/docker-bash/issues/29 # hadolint only uses default locations https://github.com/hadolint/hadolint/issues/977 # hadolint global ignore=DL4006 + FROM docker.io/library/bash:5.2.37@sha256:01a15c6f48f6a3c08431cd77e11567823530b18159889dca3b7309b707beef91 SHELL ["/usr/local/bin/bash", "-u", "-e", "-o", "pipefail", "-c"] diff --git a/renovate.json b/renovate.json index a7a4671..ad623e7 100644 --- a/renovate.json +++ b/renovate.json @@ -10,15 +10,15 @@ "- docker.io/kokuwaio/buildctl:(?v[0-9]+\\.[0-9]+\\.[0-9]+)", "- ghcr.io/kokuwaio/buildctl:(?v[0-9]+\\.[0-9]+\\.[0-9]+)", "org.opencontainers.image.version: (?v[0-9]+\\.[0-9]+\\.[0-9]+)", - "https://github.com/moby/buildkit/releases/download/(?v[0-9]+\\.[0-9]+\\.[0-9]+)/buildkit-v[0-9]+\\.[0-9]+\\.[0-9]+.linux-$SUFFIX.tar.gz", - "https://github.com/moby/buildkit/releases/download/v[0-9]+\\.[0-9]+\\.[0-9]+/buildkit-(?v[0-9]+\\.[0-9]+\\.[0-9]+).linux-$SUFFIX.tar.gz" + "github.com/moby/buildkit/releases/download/(?v[0-9]+\\.[0-9]+\\.[0-9]+)/buildkit-v[0-9]+\\.[0-9]+\\.[0-9]+.linux-\\$SUFFIX.tar.gz", + "github.com/moby/buildkit/releases/download/v[0-9]+\\.[0-9]+\\.[0-9]+/buildkit-(?v[0-9]+\\.[0-9]+\\.[0-9]+).linux-\\$SUFFIX.tar.gz" ], "datasourceTemplate": "github-tags", "packageNameTemplate": "moby/buildkit" },{ "customType": "regex", "managerFilePatterns": ["Dockerfile"], - "matchStrings": ["https://github.com/jqlang/jq/releases/download/(?jq-[0-9]+\\.[0-9]+\\.[0-9]+)/jq-linux-$SUFFIX"], + "matchStrings": ["github.com/jqlang/jq/releases/download/(?jq-[0-9]+\\.[0-9]+\\.[0-9]+)/jq-linux-\\$SUFFIX"], "datasourceTemplate": "github-tags", "packageNameTemplate": "jqlang/jq" }