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..489380e 100644 --- a/compose.yml +++ b/compose.yml @@ -31,6 +31,7 @@ services: image: codeberg.org/eotl/site-badger:0.1.0 environment: - HUGO_GIT_URL + - HUGO_GIT_BRANCH - HUGO_PUBLIC_DIR=/usr/share/nginx/website - HUGO_WORKING_DIR=/root/website - PRIVATE_ENABLED diff --git a/deploy.sh.tmpl b/deploy.sh.tmpl index 5d09a7f..c075b22 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 [ ! -d "$HUGO_GIT_BRANCH" ]; then + echo "Checkout $HUGO_GIT_BRANCH" + git reset --hard origin/$HUGO_GIT_BRANCH + git checkout origin/$HUGO_GIT_BRANCH +fi + echo "◆ Install or update Hugo Modules" hugo mod get -u