Bump Docsy to 0.7.x

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "themes/docsy"]
-	path = themes/docsy
-	url = https://github.com/google/docsy.git
-	branch = v0.2.0
 [submodule "api-ref-generator"]
 	path = api-ref-generator
 	url = https://github.com/kubernetes-sigs/reference-docs

Dockerfile

@@ -1,45 +1,35 @@
 # Credit to Julien Guyomard (https://github.com/jguyomard). This Dockerfile
-# is essentially based on his Dockerfile at
-# https://github.com/jguyomard/docker-hugo/blob/master/Dockerfile. The only significant
-# change is that the Hugo version is now an overridable argument rather than a fixed
-# environment variable.
+# was previously based on his Dockerfile at
+# https://github.com/jguyomard/docker-hugo/blob/master/Dockerfile.
 
-FROM docker.io/library/golang:1.23.0-alpine3.20
+FROM docker.io/library/debian:bookworm AS builder
 
-RUN apk add --no-cache \
+RUN apt-get update && apt-get install -y \
+  --no-install-recommends \
+    ca-certificates \
+    git \
     curl \
-    gcc \
-    g++ \
-    musl-dev \
-    build-base \
-    libc6-compat
+    golang \
+    openssh-client \
+    rsync \
+    nodejs
 
 ARG HUGO_VERSION
+RUN mkdir /build && curl -L -o /build/hugo_extended_${HUGO_VERSION}_linux-amd64.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb && apt-get install -y /build/hugo_extended_${HUGO_VERSION}_linux-amd64.deb && rm -rf /build
 
-RUN mkdir $HOME/src && \
-    cd $HOME/src && \
-    curl -L https://github.com/gohugoio/hugo/archive/refs/tags/v${HUGO_VERSION}.tar.gz | tar -xz && \
-    cd "hugo-${HUGO_VERSION}" && \
-    go install --tags extended
+RUN apt-get update && apt-get install -y \
+  --no-install-recommends \
+    npm
 
-FROM docker.io/library/golang:1.23.0-alpine3.20
+RUN rm -rf /var/cache/* # partial cleanup
 
-RUN apk add --no-cache \
-    runuser \
-    git \
-    openssh-client \
-    rsync \
-    npm && \
-    npm install -D autoprefixer postcss-cli
+WORKDIR /opt/npm
+RUN npm install -D -g autoprefixer postcss-cli google/docsy#semver:0.7.2
 
-RUN mkdir -p /var/hugo && \
-    addgroup -Sg 1000 hugo && \
-    adduser -Sg hugo -u 1000 -h /var/hugo hugo && \
+RUN useradd -m --user-group -u 60000 -d /var/hugo hugo && \
     chown -R hugo: /var/hugo && \
     runuser -u hugo -- git config --global --add safe.directory /src
 
-COPY --from=0 /go/bin/hugo /usr/local/bin/hugo
-
 WORKDIR /src
 
 USER hugo:hugo

Makefile

@@ -34,7 +34,7 @@ module-init: ## Initialize required submodules.
 all: build ## Build site with production settings and put deliverables in ./public
 
 build: module-check ## Build site with non-production settings and put deliverables in ./public
-	hugo --cleanDestinationDir --minify --environment development
+	hugo --cleanDestinationDir --minify --environment development --themesDir node_modules
 
 build-preview: module-check ## Build site with drafts and future posts enabled
 	hugo --cleanDestinationDir --buildDrafts --buildFuture --environment preview
@@ -56,7 +56,7 @@ non-production-build: module-check ## Build the non-production site, which adds
 	GOMAXPROCS=1 hugo --cleanDestinationDir --enableGitInfo --environment nonprod
 
 serve: module-check ## Boot the development server.
-	hugo server --buildFuture --environment development
+	hugo server --buildFuture --environment development --themesDir node_modules
 
 docker-image:
 	@echo -e "$(CCRED)**** The use of docker-image is deprecated. Use container-image instead. ****$(CCEND)"
@@ -97,11 +97,11 @@ docker-push: ## Build a multi-architecture image and push that into the registry
 	rm Dockerfile.cross
 
 container-build: module-check
-	$(CONTAINER_RUN) --read-only --mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 $(CONTAINER_IMAGE) sh -c "npm ci && hugo --minify --environment development"
+	$(CONTAINER_RUN) --read-only --mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 $(CONTAINER_IMAGE) sh -c "npm ci && hugo --minify --environment development --themesDir /usr/local/lib/node_modules"
 
 # no build lock to allow for read-only mounts
 container-serve: module-check ## Boot the development server using container.
-	$(CONTAINER_RUN) --cap-drop=ALL --cap-add=AUDIT_WRITE --read-only --mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 -p 1313:1313 $(CONTAINER_IMAGE) hugo server --buildFuture --environment development --bind 0.0.0.0 --destination /tmp/hugo --cleanDestinationDir --noBuildLock
+	$(CONTAINER_RUN) --cap-drop=ALL --cap-add=AUDIT_WRITE --read-only --mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 -p 1313:1313 $(CONTAINER_IMAGE) hugo server --buildFuture --environment development --themesDir /usr/local/lib/node_modules --bind 0.0.0.0 --destination /tmp/hugo --cleanDestinationDir --noBuildLock
 
 test-examples:
 	scripts/test_examples.sh install

README.md

@@ -30,22 +30,6 @@ git clone https://github.com/kubernetes/website.git
 cd website
 ```
 
-The Kubernetes website uses the [Docsy Hugo theme](https://github.com/google/docsy#readme). Even if you plan to run the website in a container, we strongly recommend pulling in the submodule and other development dependencies by running the following:
-
-### Windows
-
-```powershell
-# fetch submodule dependencies
-git submodule update --init --recursive --depth 1
-```
-
-### Linux / other Unix
-
-```bash
-# fetch submodule dependencies
-make module-init
-```
-
 ## Running the website using a container
 
 To build the site in a container, run the following: