From 2a4e7676120e2b63e43aedc758847c097818817d Mon Sep 17 00:00:00 2001
From: jholdstock <jholdstock@decred.org>
Date: Thu, 5 Sep 2024 12:14:34 +0100
Subject: [PATCH 1/3] build: Update GitHub actions.

---
 .github/workflows/build.yml  | 2 +-
 .github/workflows/docker.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8c23836..d264ef1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out source
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Tests
       run: ./bin/test.sh
     - name: Build
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ce4025a..0521ef9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,6 +8,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out source
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Build the Docker image
       run: docker build -t companyzero/bisonrelay-web:$(date +%s) .

From 366373391d79e923c96dbd562a82239bf81bc91f Mon Sep 17 00:00:00 2001
From: jholdstock <jholdstock@decred.org>
Date: Thu, 5 Sep 2024 12:14:53 +0100
Subject: [PATCH 2/3] docker: Use nginx 1.26 (latest stable)

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d4f7bfa..d12209f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ RUN bin/build-hugo.sh
 # Serve image (stable nginx version)
 # This cannot use Alpine because test/Dockerfile builds on this image and
 # expects it to have apt-get.
-FROM nginx:1.22
+FROM nginx:1.26
 
 LABEL description="bisonrelay-web server"
 LABEL version="1.0"

From a8400e8b21739e92b7aece025eb4e9f7628c0612 Mon Sep 17 00:00:00 2001
From: jholdstock <jholdstock@decred.org>
Date: Thu, 5 Sep 2024 12:16:16 +0100
Subject: [PATCH 3/3] build: Update to hugo 0.134.0

- Add a trailing slash to baseURL as expected by the new hugo version.
- Use the newer css.Sass instead of deprecated resources.ToCSS
---
 Dockerfile                       | 4 ++--
 bin/watch.sh                     | 2 +-
 src/layouts/_default/baseof.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d12209f..c3ff3a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,8 @@
 FROM alpine:latest
 
 ARG HUGO_BASEURL
-ENV HUGO_BASEURL ${HUGO_BASEURL:-https://bisonrelay.org}
-ENV HUGO_VERSION 0.110.0
+ENV HUGO_BASEURL ${HUGO_BASEURL:-https://bisonrelay.org/}
+ENV HUGO_VERSION 0.134.0
 
 LABEL description="gohugo build"
 LABEL version="1.0"
diff --git a/bin/watch.sh b/bin/watch.sh
index 80432c7..87f767a 100755
--- a/bin/watch.sh
+++ b/bin/watch.sh
@@ -18,4 +18,4 @@ hugo server \
     --buildDrafts \
     --disableFastRender \
     --source src \
-    --baseURL http://localhost:1313
+    --baseURL http://localhost:1313/
diff --git a/src/layouts/_default/baseof.html b/src/layouts/_default/baseof.html
index c176334..25e18f0 100644
--- a/src/layouts/_default/baseof.html
+++ b/src/layouts/_default/baseof.html
@@ -25,7 +25,7 @@
       
         <!-- Compile and load scss. -->
         {{ $scssOptions := (dict "targetPath" "br.css" "outputStyle" "compressed" "enableSourceMap" true) }}
-        {{ $style := resources.Get "scss/br.scss" | resources.ToCSS $scssOptions | resources.Fingerprint }}
+        {{ $style := resources.Get "scss/br.scss" | css.Sass $scssOptions | resources.Fingerprint }}
         <link rel="stylesheet" href="{{ $style.Permalink }}" integrity="{{ $style.Data.Integrity }}">
 
         <!--  Custom favicon  -->