diff --git a/.justfile b/.justfile index bf90c67..b8a3119 100644 --- a/.justfile +++ b/.justfile @@ -16,7 +16,8 @@ # Build image with local docker daemon. [group('image')] @build: - docker buildx build . --tag=kokuwaio/buildctl --platform=linux/amd64,linux/arm64 + 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')] diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 2dde0fd..bfed089 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -7,24 +7,6 @@ when: steps: - buildd: - image: kokuwaio/buildctl:v0.21.0 - pull: true - commands: - - echo $AUTH | base64 -w0 - - env | sort - environment: - auth: - docker.io: - username: {from_secret: docker_io_username} - password: {from_secret: docker_io_password} - ghcr.io: - username: {from_secret: ghcr_io_username} - password: {from_secret: ghcr_io_password} - registry.kokuwa.io: - username: {from_secret: kokuwa_io_username} - password: {from_secret: kokuwa_io_password} - build: image: kokuwaio/buildctl:v0.21.0 pull: true diff --git a/entrypoint.sh b/entrypoint.sh index 5cdd572..54293cb 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -eu; +set -eXu; #CI_PIPELINE_NUMBER=1 #CI_REPO_URL=CI_REPO_URL #CI_COMMIT_SHA=123 @@ -8,7 +8,7 @@ set -eu; #PLUGIN_NAME=registry.kokuwa.io/buildctl:$CI_PIPELINE_NUMBER #PLUGIN_PLATFORM=linux/amd64,linux/arm64 #PLUGIN_AUTH='{"auths":{"registry.kokuwa.io":{"auth":"d29vZHBlY2tlcjo5cVRrVlpXSW1ITndXWXVMZ1pMajVST0FuYmZlOTEyUjlLWFFIVW51MG1iOGx5UWl5Z3hFUEZxVTN0REo5VzdE"},"ghcr.io":{"auth":"c3NjaG5hYmU6Z2hwX0lHVEswWkk0YTBqN2EzTjNIMlBmOEc2UFl1eGpEYjRmUlk0Yw=="},"https://index.docker.io/v1/":{"auth":"c3NjaG5hYmU6ZGNrcl9wYXRfZ3RnZ1k4RFdzUjJmZlRLTU1yWVI2cFR5Y1VF=="}}}' - +echo $PLUGIN_AUTH | base64 -w0 ## ## check input ##