From 4f88615c316161571217cb51e6265c4158aeb77b Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Wed, 26 Jun 2024 19:47:02 -0500 Subject: [PATCH] Update builder --- .woodpecker.yml | 5 +++-- nix/docker-builder.nix | 4 ++-- scripts/upload-builder.sh | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 101f933..ecbef55 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,10 +1,11 @@ steps: build: - image: git.mzhang.io/michael/blog-docker-builder:ksi5l9c786i4x6sq2crsjqlmcfidvvza + image: git.mzhang.io/michael/blog-docker-builder:n409yvghr9s92rshjfca0niqsq5vnpl7 environment: - ASTRO_TELEMETRY_DISABLED=1 commands: - mkdir /tmp + - rm -rf node_modules - npm i -g pnpm@9.4.0 - npx pnpm install --frozen-lockfile - npx pnpm run build @@ -12,7 +13,7 @@ steps: - event: push deploy: - image: git.mzhang.io/michael/blog-docker-builder:ksi5l9c786i4x6sq2crsjqlmcfidvvza + image: git.mzhang.io/michael/blog-docker-builder:n409yvghr9s92rshjfca0niqsq5vnpl7 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 b90c7af..2b65016 100644 --- a/nix/docker-builder.nix +++ b/nix/docker-builder.nix @@ -6,8 +6,8 @@ , openssh , bash , coreutils -, bun , nodejs_20 +, gnused }: dockerTools.buildLayeredImage { @@ -20,8 +20,8 @@ dockerTools.buildLayeredImage { openssh bash coreutils - bun nodejs_20 + gnused usrBinEnv caCertificates ]; diff --git a/scripts/upload-builder.sh b/scripts/upload-builder.sh index bcb05a3..ca29796 100755 --- a/scripts/upload-builder.sh +++ b/scripts/upload-builder.sh @@ -9,4 +9,4 @@ docker image tag "$IMAGE_NAME" "$REMOTE_IMAGE_NAME" docker push "$REMOTE_IMAGE_NAME" set -x -sed -i -E "s~(.*image: )blog-docker-builder:?.*~\1$REMOTE_IMAGE_NAME~" .woodpecker.yml +sed -i -E "s~(.*image: ).*blog-docker-builder:?.*~\1$REMOTE_IMAGE_NAME~" .woodpecker.yml