This commit is contained in:
parent
b574a929a7
commit
6324b12c33
3 changed files with 3 additions and 12 deletions
|
@ -1,6 +1,6 @@
|
||||||
steps:
|
steps:
|
||||||
build:
|
build:
|
||||||
image: git.mzhang.io/michael/blog-docker-builder:qr7whzx27pqqakdxm32c7b958ggyg07z
|
image: git.mzhang.io/michael/blog-docker-builder:x0m1c7r2qzc3qbyw8sfv5flfv75xiqdz
|
||||||
environment:
|
environment:
|
||||||
- ASTRO_TELEMETRY_DISABLED=1
|
- ASTRO_TELEMETRY_DISABLED=1
|
||||||
commands:
|
commands:
|
||||||
|
@ -13,7 +13,7 @@ steps:
|
||||||
- event: push
|
- event: push
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
image: git.mzhang.io/michael/blog-docker-builder:qr7whzx27pqqakdxm32c7b958ggyg07z
|
image: git.mzhang.io/michael/blog-docker-builder:x0m1c7r2qzc3qbyw8sfv5flfv75xiqdz
|
||||||
commands:
|
commands:
|
||||||
- echo "$${SSH_SECRET_KEY}" > SSH_SECRET_KEY
|
- echo "$${SSH_SECRET_KEY}" > SSH_SECRET_KEY
|
||||||
- chmod 600 SSH_SECRET_KEY
|
- chmod 600 SSH_SECRET_KEY
|
||||||
|
|
|
@ -34,13 +34,6 @@ dockerTools.buildLayeredImage {
|
||||||
# groupadd -r builder
|
# groupadd -r builder
|
||||||
# useradd -r -g builder builder
|
# useradd -r -g builder builder
|
||||||
# '';
|
# '';
|
||||||
|
|
||||||
config = {
|
|
||||||
Cmd = ''
|
|
||||||
|
|
||||||
'';
|
|
||||||
# User = "builder:builder";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# copyToRoot = with dockerTools; buildEnv {
|
# copyToRoot = with dockerTools; buildEnv {
|
||||||
|
|
|
@ -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
|
sed -i -E "s~(.*image: ).*blog-docker-builder:?.*~\1$REMOTE_IMAGE_NAME~" .woodpecker.yml
|
||||||
echo "Created $REMOTE_IMAGE_NAME"
|
echo "Created $REMOTE_IMAGE_NAME"
|
||||||
|
|
||||||
if [ "${1+}" == "push" ]; then
|
docker push -q "$REMOTE_IMAGE_NAME"
|
||||||
docker push "$REMOTE_IMAGE_NAME"
|
|
||||||
fi
|
|
||||||
|
|
Loading…
Reference in a new issue