Skip to content
This repository was archived by the owner on Apr 19, 2024. It is now read-only.

Merge upstream conflicts #11

Open
10d9e wants to merge 1,108 commits into
base: main
Choose a base branch
from
Open

Merge upstream conflicts #11

10d9e wants to merge 1,108 commits into from

Conversation

@10d9e
Copy link

@10d9e 10d9e commented Jul 22, 2022

No description provided.

pratik-parikh01 and others added 30 commits October 8, 2024 22:07
@pratik-parikh01
Add validate action to validate api docs
3f4ec64 
Signed-off-by: Pratik <pratikgparikh@gmail.com>
@joaodrp
ci: Add validation for api docs (#4481)
d0eebf3
@flavianmissi
test s3 driver walk of empty dir
e44d931 
Signed-off-by: Flavian Missi <fmissi@redhat.com>
@flavianmissi
avoid appending directory as file path in s3 driver Walk
2e7482c 
when a directory is empty, the s3 api lists it with a trailing slash.
this causes the path to be appended twice to the walkInfo slice, causing
purge uploads path transformations to panic when the `_uploads` is
emtpy.

this adds a check for file paths ending on slash, and do not append
those as regular files to the walkInfo slice.

fixes #4358

Signed-off-by: Flavian Missi <fmissi@redhat.com>
@milosgajdos
ci: fix GHA CI build matrix
997c29d 
It would appear that requesting Go 1.21 in the build matrix has no
effect whatsoever on what go toolchain is actually used to build the
project.

Specifying 1.22.0 in the go.mod go directive forces the 1.22 toolchain
to be used for building Go source files, ignoring whatever Go version we
set in the GHA CI matrix.

Luckily we can enforce the right setting by setting GOTOOLCHAIN=local
which forces Go to use the locally available toolchain instead of
downloading the one requested by go.mod.

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@milosgajdos
Run vendor on 1.21
be0051c 
Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@milosgajdos
Fix a typo in GHA build workflow comment
8857979 
Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@milosgajdos
Bump go version in go.mod
6df0fd9 
Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@milosgajdos
Bump Go version in Dockerfiles
b9b96d9 
Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@milosgajdos
avoid appending directory as file path in s3 driver Walk (#4485)
bce9fcd
@schanzel
docs: Update to refer to new image tag v3
7b3e6d5 
This updates references to the registry image tag from `:2` to `:3`.

Fixes #4356

Signed-off-by: Benjamin Schanzel <benjamin.schanzel@bmw.de>
@milosgajdos
ci: fix GHA CI build matrix (#4436)
c427f84
@milosgajdos
Bump dependencies
1c26d98 
In preparation to the next release we're going to bump some deps such as
various cloud SDKs we can test i.e. AWS, Google Cloud, etc.

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@milosgajdos
Bump google storage module
3996413 
Also bump the golangci version

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@uhthomas
fix(registry/storage/driver/s3-aws): use a consistent multipart chunk…
5ee5aaa 
… size

Some S3 compatible object storage systems like R2 require that all
multipart chunks are the same size. This was mostly true before, except
the final chunk was larger than the requested chunk size which causes
uploads to fail.

In addition, the two byte slices have been replaced with a single
*bytes.Buffer and the surrounding code simplified significantly.

Fixes: #3873

Signed-off-by: Thomas Way <thomas@6f.io>
@dvdksn
docs: update hugo and theme versions
da2f24e 
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
@milosgajdos
docs: update hugo and theme versions (#4499)
85e99bc
@milosgajdos
Update lint.Dockerfile
bd52394 
Add a timeout to the lint:
By default it is set to 1m

Remove ARGs where not needed.

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@milosgajdos
Bump otel dependencies
3ac2285 
We want to be consistent in our deps so tracking down issue does not end
up in a murder mystery hunt. This commit picks a specific otel versions
that are unified in this codebase.

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@milosgajdos
fix(registry/storage/driver/s3-aws): use a consistent multipart chunk…
099201a 
… size (#4424)
@milosgajdos
feat: support custom exec-based credential helper in proxy mode (#4438)
f7236ab
@milosgajdos
Bump dependencies (#4498)
d67b46a
@milosgajdos
Prep for v3-rc.1 release
4118c80 
* Created a changelog file
* Updated mailmap
* Updated version

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@milosgajdos
Prep for v3-rc.1 release (#4502)
3ddd142
@krynju
Upgrade go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
abbe03e 
Signed-off-by: krynju <krystian.gulinski@juliahub.com>
@dependabot
build(deps): bump codecov/codecov-action from 4 to 5
4dfab83 
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4 to 5.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@v4...v5)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@wy65701436
build(deps): bump codecov/codecov-action from 4 to 5 (#4508)
a44f1fb
@milosgajdos
Upgrade `go.opentelemetry.io/contrib/instrumentation/net/http/otelhtt…
e3007cd 
…p` (#4507)
@barbu110
[docs] Explain how to configure a list through env variables
1d104a9 
Signed-off-by: Victor Barbu <git.zqk3n@vicb.cc>
@milosgajdos
docs: Explain how to configure a list through env variables (#4522)
f2658ee
thaJeztah and others added 30 commits February 11, 2026 10:10
@thaJeztah
update golangci-lint to v2.9 and fix linting issues
f5e1a89 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@milosgajdos
update golangci-lint to v2.9 and fix linting issues (#4780)
2cd77a0
@thaJeztah @milosgajdos
Dockerfile: update tonistiigi/xx v1.9.0
efd7ffb 
Also add a well-formatted comment (for outputing in `docker build --call=outline .`);

    docker build -q --call=outline .
    BUILD ARG        VALUE                                     DESCRIPTION
    GO_VERSION       1.23.7
    ALPINE_VERSION   3.21
    XX_VERSION       1.9.0                                     version of the tonistiigi/xx utility to use.
    PKG              github.com/distribution/distribution/v3
    LDFLAGS          -s -w
    BUILDTAGS

full diff: tonistiigi/xx@v1.6.1...v1.9.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @milosgajdos
update to go1.25.7, alpine 3.23
60d2cd5 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @milosgajdos
drop support for go1.23
f5d656e 
go1.23 is EOL since August 2025 (when go1.25 was released), and (indirect)
dependencies start to require it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @milosgajdos
vendor: github.com/sirupsen/logrus v1.9.4
0046406 
full diff: sirupsen/logrus@v1.9.3...v1.9.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @milosgajdos
vendor: golang.org/x/sys v0.41.0
3e3e153 
full diff: https://cs.opensource.google/go/x/sys/+/refs/tags/v0.31.0...refs/tags/v0.41.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @milosgajdos
vendor: golang.org/x/text v0.34.0
aebf061 
full diff: https://cs.opensource.google/go/x/text/+/refs/tags/v0.23.0...refs/tags/v0.34.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @milosgajdos
vendor: golang.org/x/crypto v0.48.0, golang.org/x/net v0.50.0
87a9711 
full diff: https://cs.opensource.google/go/x/crypto/+/refs/tags/v0.36.0...refs/tags/v0.48.0
full diff: https://cs.opensource.google/go/x/net/+/refs/tags/v0.38.0...refs/tags/v0.50.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @milosgajdos
vendor: golang.org/x/time v0.14.0
ae7c498 
full diff: https://cs.opensource.google/go/x/time/+/refs/tags/v0.6.0...refs/tags/v0.14.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @milosgajdos
vendor: golang.org/x/oauth2 v0.35.0
9b79cf5 
full diff: https://cs.opensource.google/go/x/oauth2/+/refs/tags/v0.28.0...refs/tags/v0.35.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@ningmingxiao @thaJeztah
use filepath instead of path
5ddf789 
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
@ningmingxiao @thaJeztah
fix: sync parent dir to ensure data is reliably stored
b4f2af3 
Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @milosgajdos
vendor: github.com/docker/docker-credential-helpers v0.9.5
abc9deb 
full diff: docker/docker-credential-helpers@v0.8.2...v0.9.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
modernize code
775d373 
Automated fixing, using Go's "modernize" tool;

    go install golang.org/x/tools/go/analysis/passes/modernize/cmd/modernize@latest
    modernize -fix ./...

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
fix "prealloc" linting
f18b8d7 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @milosgajdos
vendor: github.com/opencontainers/image-spec v1.1.1
c4a0bd3 
full diff: opencontainers/image-spec@v1.1.0...v1.1.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @milosgajdos
vendor: github.com/klauspost/compress v1.18.4
d2398c5 
full diff: klauspost/compress@v1.17.11...v1.18.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
vendor: github.com/bshuster-repo/logrus-logstash-hook v1.1.0
10e0e8e 
- adds go.mod
- DefaultFormatter now uses RFC3339Nano as default

full diff: bshuster-repo/logrus-logstash-hook@v1.0.0...v1.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
vendor: github.com/spf13/cobra v1.10.2
3e841a3 
full diff:

- spf13/cobra@v1.8.0...v1.10.2
- spf13/pflag@v1.0.5...v1.0.10

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@milosgajdos
fix: prefer otel variables over hard coded service name (#4771)
afaf0c0
@milosgajdos
vendor: github.com/spf13/cobra v1.10.2 (#4789)
c52376b
@milosgajdos
vendor: github.com/bshuster-repo/logrus-logstash-hook v1.1.0 (#4788)
1cc0615
@milosgajdos
fix: sync parent dir to ensure data is reliably stored (#4774)
423d121
@milosgajdos
modernize code (#4784)
3cf5a08
@thaJeztah
vendor: github.com/go-jose/go-jose/v4 v4.1.3
2a52e90 
No longer has dependencies

full diff: go-jose/go-jose@v4.0.5...v4.1.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
go.mod: remove outdated comment
01a853e 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
vendor: github.com/docker/go-events 605354379745
eba1fb4 
full diff: docker/go-events@e31b211...6053543

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@milosgajdos
vendor: github.com/docker/go-events 605354379745 (#4791)
8f50906
@milosgajdos
vendor: github.com/go-jose/go-jose/v4 v4.1.3 (#4790)
ab67ffa
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.