Skip to content

Commit

Permalink
Merge pull request #21300 from dvdksn/bk0.17-bx0.18
Browse files Browse the repository at this point in the history
build: buildx v0.18.0, buildkit v0.17.0, dockerfile v1.11.0
  • Loading branch information
dvdksn authored Oct 31, 2024
2 parents 5cd626c + 8201899 commit 29d100f
Show file tree
Hide file tree
Showing 20 changed files with 441 additions and 97 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ RUN hugo mod vendor

# vendor is an empty stage with only vendored Hugo modules
FROM scratch AS vendor
COPY --from=update-modules /src/_vendor /_vendor
COPY --from=update-modules /src/go.* /
COPY --from=update-modules /project/_vendor /_vendor
COPY --from=update-modules /project/go.* /

# build-upstream builds an upstream project with a replacement module
FROM build-base AS build-upstream
Expand Down
2 changes: 1 addition & 1 deletion _vendor/github.com/docker/buildx/docs/bake-reference.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 52 additions & 13 deletions _vendor/github.com/moby/buildkit/docs/buildkitd.toml.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 29d100f

Please sign in to comment.