Fix upgrade scripts when using docker

Dockerfile

@@ -1,7 +1,8 @@
 FROM mcr.microsoft.com/playwright:v1.41.2 as playwright
 
 FROM playwright as playwright-hugo
-RUN wget -O /tmp/hugo.tar.gz https://github.com/gohugoio/hugo/releases/download/v0.123.3/hugo_extended_0.123.3_Linux-64bit.tar.gz
+ARG HUGO_VERSION="0.123.7"
+RUN wget --max-redirect=1 -O /tmp/hugo.tar.gz "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz"
 RUN tar zxvf /tmp/hugo.tar.gz -C /tmp/
 RUN mv /tmp/hugo /usr/bin/
 

netlify.toml

@@ -1,3 +1,3 @@
 [build.environment]
-  HUGO_VERSION = "0.123.3"
-  NODE_ENV = "production"
+  HUGO_VERSION="0.123.7"
+  NODE_ENV="production"

scripts/compose-hugo.dockerfile

@@ -1,8 +1,9 @@
-FROM node:20.11.0-alpine as base
-RUN apk add --update tzdata rsync openssh gcompat libc6-compat libstdc++
+FROM node:20.11.1-alpine as base
+RUN apk add --update tzdata rsync openssh gcompat libc6-compat libstdc++ wget
 
 FROM base as hugo
-RUN wget -O /tmp/hugo.tar.gz https://github.com/gohugoio/hugo/releases/download/v0.122.0/hugo_extended_0.122.0_Linux-64bit.tar.gz
+ARG HUGO_VERSION="0.123.7"
+RUN wget --max-redirect=1 -O /tmp/hugo.tar.gz "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz"
 RUN tar zxvf /tmp/hugo.tar.gz -C /tmp/
 RUN mv /tmp/hugo /usr/bin/
 RUN hugo version

scripts/compose-hugo.sh

@@ -3,7 +3,7 @@
 uid=$(stat -c '%u' /app/package.json)
 
 if [[ "$uid" != "0" ]]; then
-	chown -R "$uid:$uid" /home /app/node_modules /app/dist
+	chown -R "$uid:$uid" /home /app/node_modules /app/resources
 	if ! getent passwd "$uid"; then
 		adduser -D -u "$uid" app
 		su - app

scripts/upgrade-hugo.sh

@@ -13,13 +13,12 @@ else
 	exit 1
 fi
 
-netlify_regex="s/HUGO_VERSION = \"[0-9]+\.[0-9]+\.[0-9]+\"/HUGO_VERSION = \"$version\"/g"
-dockerfile_regex1="s/hugo\/releases\/download\/v[0-9]+\.[0-9]+\.[0-9]+/hugo\/releases\/download\/v$version/g"
-dockerfile_regex2="s/hugo_extended_[0-9]+\.[0-9]+\.[0-9]+/hugo_extended_$version/g"
+regex="s/HUGO_VERSION=\"[0-9]+\.[0-9]+\.[0-9]+\"/HUGO_VERSION=\"$version\"/g"
 
 files=(
 	netlify.toml
 	Dockerfile
+	./scripts/compose-hugo.dockerfile
 )
 
 cleanup() {
@@ -32,16 +31,9 @@ cleanup() {
 trap cleanup EXIT
 
 for x in "${files[@]}"; do
-	sed -E "$netlify_regex" "$x" >"$x.upg"
+	sed -E "$regex" "$x" >"$x.upg"
 	mv "$x.upg" "$x"
 done
 
-for x in "${files[@]}"; do
-	sed -E "$dockerfile_regex1" "$x" >"$x.upg"
-	mv "$x.upg" "$x"
-done
-
-for x in "${files[@]}"; do
-	sed -E "$dockerfile_regex2" "$x" >"$x.upg"
-	mv "$x.upg" "$x"
-done
+echo "Rebuilding docker image for docker-compose"
+docker compose build

scripts/upgrade-node.sh

@@ -27,3 +27,6 @@ sed -E "$regex" "$file" >"$file.upg"
 mv "$file.upg" "$file"
 
 printf "v$version" >.nvmrc
+
+echo "Rebuilding docker image for docker-compose"
+docker compose build