diff --git a/.woodpecker.yml b/.woodpecker.yml index 138fc27..4ea19d6 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,6 +1,6 @@ steps: build: - image: git.mzhang.io/michael/blog-docker-builder:qr7whzx27pqqakdxm32c7b958ggyg07z + image: git.mzhang.io/michael/blog-docker-builder:x0m1c7r2qzc3qbyw8sfv5flfv75xiqdz environment: - ASTRO_TELEMETRY_DISABLED=1 commands: @@ -13,7 +13,7 @@ steps: - event: push deploy: - image: git.mzhang.io/michael/blog-docker-builder:qr7whzx27pqqakdxm32c7b958ggyg07z + image: git.mzhang.io/michael/blog-docker-builder:x0m1c7r2qzc3qbyw8sfv5flfv75xiqdz commands: - echo "$${SSH_SECRET_KEY}" > SSH_SECRET_KEY - chmod 600 SSH_SECRET_KEY diff --git a/nix/docker-builder.nix b/nix/docker-builder.nix index 7e4a81a..4ebda55 100644 --- a/nix/docker-builder.nix +++ b/nix/docker-builder.nix @@ -34,13 +34,6 @@ dockerTools.buildLayeredImage { # groupadd -r builder # useradd -r -g builder builder # ''; - - config = { - Cmd = '' - - ''; - # User = "builder:builder"; - }; } # copyToRoot = with dockerTools; buildEnv { diff --git a/scripts/upload-builder.sh b/scripts/upload-builder.sh index 5f78a16..18be33a 100755 --- a/scripts/upload-builder.sh +++ b/scripts/upload-builder.sh @@ -10,6 +10,4 @@ docker image tag "$IMAGE_NAME" "$REMOTE_IMAGE_NAME" sed -i -E "s~(.*image: ).*blog-docker-builder:?.*~\1$REMOTE_IMAGE_NAME~" .woodpecker.yml echo "Created $REMOTE_IMAGE_NAME" -if [ "${1+}" == "push" ]; then - docker push "$REMOTE_IMAGE_NAME" -fi +docker push -q "$REMOTE_IMAGE_NAME"