chore: fixing docs due to upgrade in Hugo#9977
Conversation
Summary of ChangesHello @Darien-Lin, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request resolves critical build failures in the documentation system that arose after a Hugo version upgrade. It involved updating the Docsy theme, refactoring its integration to leverage Hugo modules, and introducing specific adjustments to the build process and shortcode usage to ensure compatibility with the newer Hugo environment. Additionally, a minor content correction was made to fix a broken URL. Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Changelog
Activity
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Code Review
This pull request effectively addresses build failures caused by the Hugo upgrade. The changes to update the Docsy theme, adjust Hugo configuration, and fix shortcode handling are all necessary steps. I've provided a few suggestions to further improve the changes:
- In
build.sh, I've suggested using a symlink instead of copying files to align with the comment and improve efficiency. - In the
Dockerfile, I've pointed out that the base image is end-of-life and should be updated for security reasons. I also suggested combiningRUNlayers to optimize the Docker image. - In
config.toml, I've noted a redundant configuration entry that can be removed for better maintainability.
These are minor points in an otherwise solid PR that fixes the documentation build.
| ENV DOCSY_VERSION=v0.14.1 | ||
| ENV DOCSY_URL=https://github.com/google/docsy.git | ||
| RUN apk add --no-cache git | ||
| RUN apk add --no-cache git npm |
There was a problem hiding this comment.
The alpine:3.10 base image used in this stage (defined on line 16) has reached its end of life (EOL) and is no longer receiving security updates. It is highly recommended to upgrade to a more recent, supported version of Alpine (e.g., alpine:3.18 or later) to ensure the security of the build environment. This applies to the other stages in this Dockerfile that also use alpine:3.10.
| # to prevent changing existing structure, we will copy over the files before hugo invocation. | ||
| mkdir -p layouts/partials/shortcodes |
There was a problem hiding this comment.
The comment on line 26 mentions creating a symlink, but the script uses cp -r to copy the directory, which creates a duplicate. This is less efficient and inconsistent with the comment. Using a symlink is a better approach here as it avoids duplication and aligns with the stated intent.
Additionally, the mkdir -p layouts/partials/shortcodes is not correct for creating a symlink named shortcodes. You only need to ensure the parent directory layouts/partials exists.
| # to prevent changing existing structure, we will copy over the files before hugo invocation. | |
| mkdir -p layouts/partials/shortcodes | |
| mkdir -p layouts/partials | |
| ln -s ../shortcodes layouts/partials/shortcodes |
| RUN git clone "${DOCSY_URL}" . && \ | ||
| git reset --hard "${DOCSY_VERSION}" && \ | ||
| git submodule update --init --recursive && \ | ||
| git checkout "${DOCSY_VERSION}" && \ | ||
| git submodule update --init --recursive --force && \ | ||
| rm -rf .git | ||
|
|
||
| # vendors are installed via npm. |
There was a problem hiding this comment.
To reduce the number of layers in the Docker image and improve build efficiency, it's a good practice to combine consecutive RUN commands. The npm install can be chained with the preceding git operations.
RUN git clone "${DOCSY_URL}" . && \
git checkout "${DOCSY_VERSION}" && \
git submodule update --init --recursive --force && \
npm install && \
rm -rf .git
| title = "Skaffold" | ||
| description = "Easy and Repeatable Container & Kubernetes Development" | ||
| languageName ="English" | ||
| contentDir = "content/en" |
fixing docs due to upgrade in Hugo
* chore: bump github.com/sigstore/cosign/v2 from 2.6.1 to 2.6.2 (#9948) Bumps [github.com/sigstore/cosign/v2](https://github.com/sigstore/cosign) from 2.6.1 to 2.6.2. - [Release notes](https://github.com/sigstore/cosign/releases) - [Changelog](https://github.com/sigstore/cosign/blob/main/CHANGELOG.md) - [Commits](sigstore/cosign@v2.6.1...v2.6.2) --- updated-dependencies: - dependency-name: github.com/sigstore/cosign/v2 dependency-version: 2.6.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * cicd: bazel github presubmit flow fixes for recent bazel 9.0.0 release (#9961) bazel build fixes for recent bazel 9.0.0 release * chore: bump github.com/sigstore/sigstore from 1.10.3 to 1.10.4 (#9957) Bumps [github.com/sigstore/sigstore](https://github.com/sigstore/sigstore) from 1.10.3 to 1.10.4. - [Release notes](https://github.com/sigstore/sigstore/releases) - [Commits](sigstore/sigstore@v1.10.3...v1.10.4) --- updated-dependencies: - dependency-name: github.com/sigstore/sigstore dependency-version: 1.10.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump github.com/sigstore/rekor from 1.4.3 to 1.5.0 (#9956) Bumps [github.com/sigstore/rekor](https://github.com/sigstore/rekor) from 1.4.3 to 1.5.0. - [Release notes](https://github.com/sigstore/rekor/releases) - [Changelog](https://github.com/sigstore/rekor/blob/main/CHANGELOG.md) - [Commits](sigstore/rekor@v1.4.3...v1.5.0) --- updated-dependencies: - dependency-name: github.com/sigstore/rekor dependency-version: 1.5.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump github.com/theupdateframework/go-tuf/v2 from 2.3.0 to 2.4.1 (#9962) Bumps [github.com/theupdateframework/go-tuf/v2](https://github.com/theupdateframework/go-tuf) from 2.3.0 to 2.4.1. - [Release notes](https://github.com/theupdateframework/go-tuf/releases) - [Commits](theupdateframework/go-tuf@v2.3.0...v2.4.1) --- updated-dependencies: - dependency-name: github.com/theupdateframework/go-tuf/v2 dependency-version: 2.4.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * test(integration): Update busybox and alpine:3 to use the mirror to avoid docker rate hub limit errors (#9966) test(integration): mirror busybox and alpine:3 images to gcr.io * chore: bump github.com/go-git/go-git/v5 from 5.16.3 to 5.16.5 (#9971) Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) from 5.16.3 to 5.16.5. - [Release notes](https://github.com/go-git/go-git/releases) - [Commits](go-git/go-git@v5.16.3...v5.16.5) --- updated-dependencies: - dependency-name: github.com/go-git/go-git/v5 dependency-version: 5.16.5 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump golang.org/x/oauth2 from 0.7.0 to 0.27.0 in /examples/grpc-e2e-tests/service (#9918) chore: bump golang.org/x/oauth2 in /examples/grpc-e2e-tests/service Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.7.0 to 0.27.0. - [Commits](golang/oauth2@v0.7.0...v0.27.0) --- updated-dependencies: - dependency-name: golang.org/x/oauth2 dependency-version: 0.27.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump golang.org/x/crypto from 0.36.0 to 0.45.0 in /hack/tools (#9916) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.36.0 to 0.45.0. - [Commits](golang/crypto@v0.36.0...v0.45.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.45.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Use mirror in Dockerfiles for integration tests to prevent docker hub rate limits (#9970) * use mirror in Dockerfiles for integration tests * use argument prefix instead * fix for multi stage * more fixes * fix buildx-bin error * Bring back comments * missed a comment * chore: upgrade golang to 1.25.7 (#9973) Co-authored-by: Darien-Lin <darienl@google.com> * Updated Dockerfile to try to fix vuln bug (#9974) * Updated Dockerfile to try to fix vuln bug * Addressed the gemini-code-assist comments * Fixed the dockerfile so it runs using docker build -f deploy/webhook-v2/Dockerfile . * Updated the node version to fix error (#9976) * Updated Dockerfile to try to fix vuln bug * Addressed the gemini-code-assist comments * Fixed the dockerfile so it runs using docker build -f deploy/webhook-v2/Dockerfile . * Updated node version to try and fix error * chore: fixing docs due to upgrade in Hugo (#9977) fixing docs due to upgrade in Hugo --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: menahyouyeah <minnah@google.com> Co-authored-by: Darien-Lin <darienl@google.com> Co-authored-by: ruhi-chaddha <ruhichaddha@google.com>
fixing docs due to upgrade in Hugo
Description
After updating the Hugo version, the build of the webpage started failing because of breaking changes from hugo. This required docsy updates and well as resolution of the build.sh (for workarounds) and content updates.
Picture depicted above shows that the local hugo serve shows that the page is rendered correctly.