From df475804bfc5fc5950088368fb9b507521c56566 Mon Sep 17 00:00:00 2001 From: stevensting Date: Fri, 3 Apr 2026 08:57:07 +0200 Subject: [PATCH] switched to coop cloud site badger, introduced two hugo env vars, and fix for conf --- .env.sample | 11 +++++++---- abra.sh | 2 +- compose.yml | 4 +++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.env.sample b/.env.sample index 4895dda..b474d9f 100644 --- a/.env.sample +++ b/.env.sample @@ -6,13 +6,16 @@ LETS_ENCRYPT_ENV=production COMPOSE_FILE="compose.yml" # **NOTE** Please change this value to your repo -HUGO_GIT_URL=git@codeberg.org:eotl/example-repo.git +HUGO_GIT_URL=ssh://git@codeberg.org:eotl/example-repo.git +# optionally configure git branch +#HUGO_GIT_BRANCH=staging + +# Configrue hugo build mode (takes precedence over the config file) +HUGO_BASEURL=https://${DOMAIN} +HUGO_ENVIRONMENT=production # set the used Hugo version optionally, otherwise the version defined in site-badger is used #HUGO_VERSION=0.143.1 -# Configure git branch -#HUGO_GIT_BRANCH=staging - # HTTP Basic Auth protected /deploy endpoint #COMPOSE_FILE="$COMPOSE_FILE:compose.auth.yml" #AUTH_ENABLED=1 diff --git a/abra.sh b/abra.sh index 4fa4798..557d3a7 100644 --- a/abra.sh +++ b/abra.sh @@ -1,6 +1,6 @@ export APP_ENTRYPOINT_VERSION=v1 export BADGER_ENTRYPOINT_VERSION=v2 -export DEFAULT_CONF_VERSION=v1 +export DEFAULT_CONF_VERSION=v2 export SSH_CONF_VERSION=v1 export SSH_DEPLOY_KEY_VERSION=v1 export WEBHOOKD_SCRIPT_VERSION=v3 diff --git a/compose.yml b/compose.yml index e306756..54d522d 100644 --- a/compose.yml +++ b/compose.yml @@ -29,7 +29,7 @@ services: - "coop-cloud.${STACK_NAME}.version=v0.5.0+1.29.5-alpine" badger: - image: codeberg.org/eotl/site-badger:0.2.0 + image: git.coopcloud.tech/toolshed/site-badger:0.3.0 environment: - CUSTOM_DEPLOY_ENABLED - CUSTOM_DEPLOY_SCRIPT @@ -41,6 +41,8 @@ services: - PRIVATE_ENABLED - WHD_SCRIPTS=/root/scripts - WHD_HOOK_TIMEOUT=${WHD_HOOK_TIMEOUT:-10} + - HUGO_ENVIRONMENT + - HUGO_BASEURL command: webhookd entrypoint: /entrypoint.sh networks: -- 2.54.0