diff --git a/.justfile b/.justfile index b8a3119..a96f31e 100644 --- a/.justfile +++ b/.justfile @@ -7,7 +7,7 @@ # Run linter. @lint: docker run --rm --read-only --volume=$(pwd):$(pwd):ro --workdir=$(pwd) kokuwaio/shellcheck - docker run --rm --read-only --volume=$(pwd):$(pwd):ro --workdir=$(pwd) kokuwaio/hadolint + docker run --rm --read-only --volume=$(pwd):$(pwd):ro --workdir=$(pwd) kokuwaio/hadolint docker run --rm --read-only --volume=$(pwd):$(pwd):ro --workdir=$(pwd) kokuwaio/yamllint docker run --rm --read-only --volume=$(pwd):$(pwd):rw --workdir=$(pwd) kokuwaio/markdownlint --fix docker run --rm --read-only --volume=$(pwd):$(pwd):ro --workdir=$(pwd) kokuwaio/renovate @@ -16,13 +16,7 @@ # Build image with local docker daemon. [group('image')] @build: - docker buildx build . --tag=kokuwaio/buildctl --platform=linux/amd64,linux/arm64 --push - docker buildx build . --platform=linux/amd64,linux/arm64 --push --tag registry.kokuwa.io/b - -# Inspect image with docker. -[group('image')] -@inspect: build - docker image inspect kokuwaio/buildctl + docker buildx build . --tag=kokuwaio/buildctl --platform=linux/amd64,linux/arm64 # Inspect image layers with `dive`. [group('image')] diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml index 9ca19f3..e68f23c 100644 --- a/.woodpecker/test.yaml +++ b/.woodpecker/test.yaml @@ -13,23 +13,14 @@ labels: steps: - pr: - image: registry.kokuwa.io/kokuwaio/buildctl:ci-${CI_PIPELINE_NUMBER} - pull: true - commands: - - ls -lA - - pwd - when: - event: pull_request - - pr2: + registry.kokuwa.io/kokuwaio/buildctl:ci-${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 + registry.kokuwa.io/kokuwaio/buildctl: &version image: registry.kokuwa.io/kokuwaio/buildctl:latest pull: true commands: buildctl --version @@ -37,10 +28,10 @@ steps: event: [manual, push] branch: main - docker.io: + docker.io/kokuwaio/buildctl: image: docker.io/kokuwaio/buildctl:latest <<: *version - ghcr.io: + ghcr.io/kokuwaio/buildctl: image: ghcr.io/kokuwaio/buildctl:latest <<: *version diff --git a/entrypoint.sh b/entrypoint.sh index 455d6d7..d0cf87a 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -38,7 +38,7 @@ fi COMMAND="$COMMAND --frontend $BUILDCTL_FRONTEND" COMMAND="$COMMAND --local context='$BUILDCTL_CONTEXT'" COMMAND="$COMMAND --local dockerfile='$BUILDCTL_DOCKERFILE'" -if [[ "${PLUGIN_PLATFORM:-}" == "true" ]]; then +if [[ -n "${PLUGIN_PLATFORM:-}" ]]; then COMMAND="$COMMAND --opt platform='$PLUGIN_PLATFORM'" fi