From a4609c201d47544147ce4e86b7a01092b3dd8f9e Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Wed, 6 Mar 2024 16:07:09 +0100 Subject: [PATCH 1/2] hugo: add replace directives for all modules Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- go.mod | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/go.mod b/go.mod index 2a28a90cfc97..e1721106f2b0 100644 --- a/go.mod +++ b/go.mod @@ -12,3 +12,12 @@ require ( github.com/moby/buildkit v0.13.0-beta3.0.20240201135300-d906167d0b34 // indirect github.com/moby/moby v25.0.3-0.20240203133757-341a7978a541+incompatible // indirect ) + +replace ( + github.com/docker/buildx => github.com/docker/buildx v0.12.2-0.20240220084849-89154c7d3303 + github.com/docker/cli => github.com/docker/cli v25.0.4-0.20240221083216-f67e569a8fb9+incompatible + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.24.6 + github.com/docker/scout-cli => github.com/docker/scout-cli v1.4.1 + github.com/moby/buildkit => github.com/moby/buildkit v0.13.0-beta3.0.20240201135300-d906167d0b34 + github.com/moby/moby => github.com/moby/moby v25.0.3-0.20240203133757-341a7978a541+incompatible +) From a719c2531ffead3b186bdc2012bf3e5109b395f3 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Wed, 6 Mar 2024 16:08:12 +0100 Subject: [PATCH 2/2] hugo: use Go toolchain to update module version Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- Dockerfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ebd4e3ead7f..5d6ce1e764a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,11 +50,15 @@ RUN htmltest FROM build-base as update-modules ARG MODULE -RUN if [ -n "$MODULE" ]; then \ - hugo mod get ${MODULE}; \ - else \ - echo "no module set"; \ - fi +RUN <<"EOT" +if [ -n "$MODULE" ]; then + go mod edit -dropdreplace ${MODULE/@*/} + hugo mod get ${MODULE} + go mod edit -replace ${MODULE/@*/}=${MODULE}; +else \ + echo "no module set"; \ +fi +EOT RUN hugo mod vendor FROM scratch as vendor