From 6dfff1c53575284b1caa30ce0d1a04b9e32d9802 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 2 Apr 2024 22:57:02 +0200 Subject: [PATCH] wip: custom deploy [ci skip] See https://git.coopcloud.tech/coop-cloud/parasol-static-site/issues/6 --- .env.sample | 4 ++++ abra.sh | 2 +- compose.yml | 2 ++ deploy.sh.tmpl | 6 ++++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index b366234..490dd17 100644 --- a/.env.sample +++ b/.env.sample @@ -16,3 +16,7 @@ HUGO_GIT_URL=git@codeberg.org:offline/future.git #COMPOSE_FILE="compose.yml:compose.private.yml" #PRIVATE_ENABLED=1 #SECRET_DEPLOY_KEY_VERSION=v1 + +# Custom deployment script +#CUSTOM_DEPLOY_ENABLED=1 +#CUSTOM_DEPLOY_SCRIPT=path/customscript.sh diff --git a/abra.sh b/abra.sh index de77d33..1b18106 100644 --- a/abra.sh +++ b/abra.sh @@ -3,4 +3,4 @@ export BADGER_ENTRYPOINT_VERSION=v1 export DEFAULT_CONF_VERSION=v1 export SSH_CONF_VERSION=v1 export SSH_DEPLOY_KEY_VERSION=v1 -export WEBHOOKD_SCRIPT_VERSION=v1 +export WEBHOOKD_SCRIPT_VERSION=v2 diff --git a/compose.yml b/compose.yml index 79aa5b5..58577f4 100644 --- a/compose.yml +++ b/compose.yml @@ -30,6 +30,8 @@ services: badger: image: codeberg.org/eotl/site-badger:0.1.0 environment: + - CUSTOM_DEPLOY_ENABLED + - CUSTOM_DEPLOY_SCRIPT - HUGO_GIT_URL - HUGO_PUBLIC_DIR=/usr/share/nginx/website - HUGO_WORKING_DIR=/root/website diff --git a/deploy.sh.tmpl b/deploy.sh.tmpl index 5d09a7f..4e69bb1 100755 --- a/deploy.sh.tmpl +++ b/deploy.sh.tmpl @@ -23,6 +23,12 @@ echo "◆ Pull latest version from .git repository" git fetch --all git reset --hard origin/main +if [ "$CUSTOM_DEPLOY_ENABLED" == "1" ]; then + echo "◆ Executing custom deploy script: $HUGO_WORKING_DIR/$CUSTOM_DEPLOY_SCRIPT" + bash $HUGO_WORKING_DIR/$CUSTOM_DEPLOY_SCRIPT + exit 0 +fi + echo "◆ Install or update Hugo Modules" hugo mod get -u