From 564f9171bcae4a3e3509e93742dcfbbeb739ae1c Mon Sep 17 00:00:00 2001 From: Vezpi Date: Wed, 16 Sep 2026 08:11:39 +0000 Subject: [PATCH 1/4] feat: use separated hugo resource directory --- docker/entrypoint.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index f5478c7..2b8e1ca 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -5,7 +5,8 @@ set -e REPO_URL="${REPO_URL:-https://git.vezpi.com/Vezpi/blog.git}" URL="${URL:-blog.vezpi.com}" BRANCH="${BRANCH:-preview}" -CLONE_DIR="${CLONE_DIR:-/blog}" +BLOG_DIR="${BLOG_DIR:-/blog}" +HUGO_RESOURCE_DIR="${HUGO_RESOURCE_DIR:-/hugo-cache}" DRAFTS="" # Add drafts for preview @@ -15,15 +16,27 @@ if [ "$BRANCH" = "preview" ]; then fi # Clean blog dir -rm -rf "$CLONE_DIR" +rm -rf "$BLOG_DIR" + +# Create Hugo resource folder +mkdir -p "$HUGO_RESOURCE_DIR" # Clone repo echo "- Cloning $REPO_URL (branch: $BRANCH)..." -git clone --recurse-submodules --branch "$BRANCH" "$REPO_URL" "$CLONE_DIR" +git clone --recurse-submodules --branch "$BRANCH" "$REPO_URL" "$BLOG_DIR" # Generate static files with hugo echo "- Building site with Hugo v$HUGO_VERSION in $HUGO_DEST..." -hugo --source "$CLONE_DIR" --destination "$HUGO_DEST" --baseURL="https://${URL}" ${DRAFTS} --logLevel info --cleanDestinationDir --gc --panicOnWarning --printI18nWarnings +hugo --source "$BLOG_DIR" \ + --destination "$HUGO_DEST" \ + --resourceDir "$HUGO_RESOURCE_DIR" \ + --baseURL="https://${URL}" \ + ${DRAFTS} \ + --logLevel info \ + --cleanDestinationDir \ + --gc \ + --panicOnWarning \ + --printI18nWarnings # Start nginx echo "- Starting Nginx..." -- 2.54.0 From 4609bac7dc4917e2a973535d2ac9fd54db633485 Mon Sep 17 00:00:00 2001 From: Vezpi Date: Wed, 16 Sep 2026 08:14:48 +0000 Subject: [PATCH 2/4] fix: cache dir instead of resource --- docker/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 2b8e1ca..d864693 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -6,7 +6,7 @@ REPO_URL="${REPO_URL:-https://git.vezpi.com/Vezpi/blog.git}" URL="${URL:-blog.vezpi.com}" BRANCH="${BRANCH:-preview}" BLOG_DIR="${BLOG_DIR:-/blog}" -HUGO_RESOURCE_DIR="${HUGO_RESOURCE_DIR:-/hugo-cache}" +HUGO_CACHE_DIR="${HUGO_CACHE_DIR:-/hugo-cache}" DRAFTS="" # Add drafts for preview @@ -19,7 +19,7 @@ fi rm -rf "$BLOG_DIR" # Create Hugo resource folder -mkdir -p "$HUGO_RESOURCE_DIR" +mkdir -p "$HUGO_CACHE_DIR" # Clone repo echo "- Cloning $REPO_URL (branch: $BRANCH)..." @@ -29,7 +29,7 @@ git clone --recurse-submodules --branch "$BRANCH" "$REPO_URL" "$BLOG_DIR" echo "- Building site with Hugo v$HUGO_VERSION in $HUGO_DEST..." hugo --source "$BLOG_DIR" \ --destination "$HUGO_DEST" \ - --resourceDir "$HUGO_RESOURCE_DIR" \ + --cacheDir "$HUGO_CACHE_DIR" \ --baseURL="https://${URL}" \ ${DRAFTS} \ --logLevel info \ -- 2.54.0 From 2da3d1823e07bdf52d384176d099fd2a9e8e4af8 Mon Sep 17 00:00:00 2001 From: Vezpi Date: Wed, 16 Sep 2026 08:43:16 +0000 Subject: [PATCH 3/4] fix: remove cacheDir and use symlink --- docker/entrypoint.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index d864693..50e6a5c 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -6,7 +6,7 @@ REPO_URL="${REPO_URL:-https://git.vezpi.com/Vezpi/blog.git}" URL="${URL:-blog.vezpi.com}" BRANCH="${BRANCH:-preview}" BLOG_DIR="${BLOG_DIR:-/blog}" -HUGO_CACHE_DIR="${HUGO_CACHE_DIR:-/hugo-cache}" +HUGO_RESOURCE_DIR="${HUGO_RESOURCE_DIR:-/hugo-resources}" DRAFTS="" # Add drafts for preview @@ -18,18 +18,18 @@ fi # Clean blog dir rm -rf "$BLOG_DIR" -# Create Hugo resource folder -mkdir -p "$HUGO_CACHE_DIR" - # Clone repo echo "- Cloning $REPO_URL (branch: $BRANCH)..." git clone --recurse-submodules --branch "$BRANCH" "$REPO_URL" "$BLOG_DIR" +# Restore persistent Hugo resources cache +rm -rf "$CLONE_DIR/resources" +ln -s "$HUGO_RESOURCE_DIR" "$CLONE_DIR/resources" + # Generate static files with hugo echo "- Building site with Hugo v$HUGO_VERSION in $HUGO_DEST..." hugo --source "$BLOG_DIR" \ --destination "$HUGO_DEST" \ - --cacheDir "$HUGO_CACHE_DIR" \ --baseURL="https://${URL}" \ ${DRAFTS} \ --logLevel info \ -- 2.54.0 From 896eeab004f5e2f5b218f635c1ff030d2b679db5 Mon Sep 17 00:00:00 2001 From: Vezpi Date: Wed, 16 Sep 2026 08:48:40 +0000 Subject: [PATCH 4/4] fix: variable names --- docker/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 50e6a5c..a662606 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -6,7 +6,7 @@ REPO_URL="${REPO_URL:-https://git.vezpi.com/Vezpi/blog.git}" URL="${URL:-blog.vezpi.com}" BRANCH="${BRANCH:-preview}" BLOG_DIR="${BLOG_DIR:-/blog}" -HUGO_RESOURCE_DIR="${HUGO_RESOURCE_DIR:-/hugo-resources}" +HUGO_RESOURCES_DIR="${HUGO_RESOURCES_DIR:-/hugo-resources}" DRAFTS="" # Add drafts for preview @@ -23,8 +23,8 @@ echo "- Cloning $REPO_URL (branch: $BRANCH)..." git clone --recurse-submodules --branch "$BRANCH" "$REPO_URL" "$BLOG_DIR" # Restore persistent Hugo resources cache -rm -rf "$CLONE_DIR/resources" -ln -s "$HUGO_RESOURCE_DIR" "$CLONE_DIR/resources" +rm -rf "$BLOG_DIR/resources" +ln -s "$HUGO_RESOURCES_DIR" "$BLOG_DIR/resources" # Generate static files with hugo echo "- Building site with Hugo v$HUGO_VERSION in $HUGO_DEST..." -- 2.54.0