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) . diff --git a/Dockerfile b/Dockerfile index d4f7bfa..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" @@ -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" 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 @@ {{ $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 }}