Skip to content

Commit 22c7b30

Browse files
committed
ci: upgrade hugo to v0.136.3
https://github.com/gohugoio/hugo/releases/tag/v0.136.3 Signed-off-by: David Karlsson <[email protected]>
1 parent 4b43bed commit 22c7b30

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.github
33
.gitignore
44
.idea
5+
.hugo_build.lock
56
_releaser
67
CONTRIBUTING.md
78
Dockerfile

Dockerfile

+10-12
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ ARG GO_VERSION=1.23
88
# HTMLTEST_VERSION sets the wjdp/htmltest version for HTML testing
99
ARG HTMLTEST_VERSION=0.17.0
1010
# HUGO_VERSION sets the version of Hugo to build the site with
11-
ARG HUGO_VERSION=0.136.2
11+
ARG HUGO_VERSION=0.136.3
1212

1313
# build-base is the base stage used for building the site
1414
FROM ghcr.io/gohugoio/hugo:v${HUGO_VERSION} AS build-base
15-
USER root
1615
ENV NODE_ENV="production"
1716
RUN --mount=source=package.json,target=package.json \
1817
--mount=source=package-lock.json,target=package-lock.json \
@@ -26,8 +25,7 @@ FROM build-base AS build
2625
ARG HUGO_ENV="development"
2726
# DOCS_URL sets the base URL for the site
2827
ARG DOCS_URL="https://docs.docker.com"
29-
RUN --mount=type=cache,target=/cache \
30-
hugo --gc --minify -d /out -e $HUGO_ENV -b $DOCS_URL
28+
RUN hugo --gc --minify -e $HUGO_ENV -b $DOCS_URL
3129

3230
# lint lints markdown files
3331
FROM davidanson/markdownlint-cli2:v0.14.0 AS lint
@@ -41,7 +39,7 @@ RUN --mount=type=bind,target=. \
4139
# test validates HTML output and checks for broken links
4240
FROM wjdp/htmltest:v${HTMLTEST_VERSION} AS test
4341
WORKDIR /test
44-
COPY --from=build /out ./public
42+
COPY --from=build /project/public ./public
4543
ADD .htmltest.yml .htmltest.yml
4644
RUN htmltest
4745

@@ -76,12 +74,12 @@ ARG UPSTREAM_REPO
7674
ARG UPSTREAM_COMMIT
7775
# HUGO_MODULE_REPLACEMENTS is the replacement module for the upstream project
7876
ENV HUGO_MODULE_REPLACEMENTS="github.com/${UPSTREAM_MODULE_NAME} -> github.com/${UPSTREAM_REPO} ${UPSTREAM_COMMIT}"
79-
RUN hugo --ignoreVendorPaths "github.com/${UPSTREAM_MODULE_NAME}" -d /out
77+
RUN hugo --ignoreVendorPaths "github.com/${UPSTREAM_MODULE_NAME}"
8078

8179
# validate-upstream validates HTML output for upstream builds
8280
FROM wjdp/htmltest:v${HTMLTEST_VERSION} AS validate-upstream
8381
WORKDIR /test
84-
COPY --from=build-upstream /out ./public
82+
COPY --from=build-upstream /project/public ./public
8583
ADD .htmltest.yml .htmltest.yml
8684
RUN htmltest
8785

@@ -96,9 +94,9 @@ EOT
9694

9795
# path-warnings checks for duplicate target paths
9896
FROM build-base AS path-warnings
99-
RUN hugo --printPathWarnings > /path-warnings.txt
97+
RUN hugo --printPathWarnings > ./path-warnings.txt
10098
RUN <<EOT
101-
DUPLICATE_TARGETS=$(grep "Duplicate target paths" /path-warnings.txt)
99+
DUPLICATE_TARGETS=$(grep "Duplicate target paths" ./path-warnings.txt)
102100
if [ ! -z "$DUPLICATE_TARGETS" ]; then
103101
echo "$DUPLICATE_TARGETS"
104102
echo "You probably have a duplicate alias defined. Please check your aliases."
@@ -109,7 +107,7 @@ EOT
109107
# pagefind installs the Pagefind runtime
110108
FROM node:alpine${ALPINE_VERSION} AS pagefind
111109
ARG PAGEFIND_VERSION=1.1.1
112-
COPY --from=build /out ./public
110+
COPY --from=build /project/public ./public
113111
RUN --mount=type=bind,src=pagefind.yml,target=pagefind.yml \
114112
npx pagefind@v${PAGEFIND_VERSION} --output-path "/pagefind"
115113

@@ -121,13 +119,13 @@ COPY --from=pagefind /pagefind .
121119
FROM alpine:${ALPINE_VERSION} AS test-go-redirects
122120
WORKDIR /work
123121
RUN apk add yq
124-
COPY --from=build /out ./public
122+
COPY --from=build /project/public ./public
125123
RUN --mount=type=bind,target=. <<"EOT"
126124
set -ex
127125
./scripts/test_go_redirects.sh
128126
EOT
129127

130128
# release is an empty scratch image with only compiled assets
131129
FROM scratch AS release
132-
COPY --from=build /out /
130+
COPY --from=build /project/public /
133131
COPY --from=pagefind /pagefind /pagefind

netlify.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ publish = "public"
44
[context.deploy-preview.environment]
55
NODE_VERSION = "20"
66
NODE_ENV = "production"
7-
HUGO_VERSION = "0.136.2"
7+
HUGO_VERSION = "0.136.3"
88
HUGO_ENABLEGITINFO = "true"
99
HUGO_ENVIRONMENT = "preview"
1010

0 commit comments

Comments
 (0)