mirror of
https://github.com/project-zot/zot.git
synced 2025-04-01 02:42:32 -05:00
chore: update image and dist specs to v1.1.1 (#3023)
chore: update image-spec and dist-spec to v1.1.1 As side effect the warnings mentioned in https://github.com/project-zot/zui/issues/475#issuecomment-2715802363 should no longer show up. Signed-off-by: Andrei Aaron <aaaron@luxoft.com>
This commit is contained in:
parent
d87cdc9840
commit
2a4edde637
99 changed files with 169 additions and 149 deletions
|
@ -325,7 +325,7 @@
|
|||
[19.817463, "o", "nimal.json "]
|
||||
[20.348247, "i", "\r"]
|
||||
[20.348954, "o", "\r\n"]
|
||||
[20.35088, "o", "{\b\n \"distSpecVersion\": \"1.0.1\",\r\n \"storage\": {\r\n \"rootDirectory\": \"/tmp/zot\"\r\n },\r\n \"http\": {\r\n \"address\": \"127.0.0.1\",\r\n \"port\": \"8080\",\r\n \"ReadOnly\": false\r\n },\r\n \"log\": {\r\n \"level\": \"debug\"\r\n }\r\n}\b\n"]
|
||||
[20.35088, "o", "{\b\n \"distSpecVersion\": \"1.1.1\",\r\n \"storage\": {\r\n \"rootDirectory\": \"/tmp/zot\"\r\n },\r\n \"http\": {\r\n \"address\": \"127.0.0.1\",\r\n \"port\": \"8080\",\r\n \"ReadOnly\": false\r\n },\r\n \"log\": {\r\n \"level\": \"debug\"\r\n }\r\n}\b\n"]
|
||||
[20.351335, "o", "\u001b[32m$ \u001b[39m"]
|
||||
[21.920853, "i", "b"]
|
||||
[21.921614, "o", "b"]
|
||||
|
@ -375,7 +375,7 @@
|
|||
[27.208734, "o", "nimal.json "]
|
||||
[27.906725, "i", "\r"]
|
||||
[27.907479, "o", "\r\n"]
|
||||
[28.004213, "o", "{\"level\":\"info\",\"params\":{\"distSpecVersion\":\"1.0.1\",\"GoVersion\":\"go1.17.7\",\"Commit\":\"v1.4.0-rc3-1-ge583c2f\",\"BinaryType\":\"extended\",\"AccessControl\":null,\"Storage\":{\"Dedupe\":true,\"GC\":true,\"Commit\":false,\"GCDelay\":3600000000000,\"RootDirectory\":\"/tmp/zot\",\"StorageDriver\":null,\"SubPaths\":null},\"HTTP\":{\"Address\":\"127.0.0.1\",\"Port\":\"8080\",\"AllowOrigin\":\"\",\"TLS\":null,\"Auth\":null,\"RawAccessControl\":null,\"Realm\":\"\",\"AllowReadAccess\":false,\"ReadOnly\":false,\"Ratelimit\":null},\"Log\":{\"Level\":\"debug\",\"Output\":\"\",\"Audit\":\"\"},\"Extensions\":null},\"goroutine\":1,\"caller\":\"zotregistry.dev/zot/pkg/api/controller.go:113\",\"time\":\"2022-04-10T23:08:15.926559322-07:00\",\"message\":\"configuration settings\"}\r\n{\"level\":\"info\",\"cpus\":8,\"max. open files\":1024,\"listen backlog\":\"4096\",\"max. inotify watches\":\"60023\",\"goroutine\":1,\"caller\":\"zotregistry.dev/zot/pkg/api/controller.go:101\",\"time\":\"2022-04-10T23:08:15.926650495-07:00\",\"message\":\"runtime params\"}\r\n"]
|
||||
[28.004213, "o", "{\"level\":\"info\",\"params\":{\"distSpecVersion\":\"1.1.1\",\"GoVersion\":\"go1.17.7\",\"Commit\":\"v1.4.0-rc3-1-ge583c2f\",\"BinaryType\":\"extended\",\"AccessControl\":null,\"Storage\":{\"Dedupe\":true,\"GC\":true,\"Commit\":false,\"GCDelay\":3600000000000,\"RootDirectory\":\"/tmp/zot\",\"StorageDriver\":null,\"SubPaths\":null},\"HTTP\":{\"Address\":\"127.0.0.1\",\"Port\":\"8080\",\"AllowOrigin\":\"\",\"TLS\":null,\"Auth\":null,\"RawAccessControl\":null,\"Realm\":\"\",\"AllowReadAccess\":false,\"ReadOnly\":false,\"Ratelimit\":null},\"Log\":{\"Level\":\"debug\",\"Output\":\"\",\"Audit\":\"\"},\"Extensions\":null},\"goroutine\":1,\"caller\":\"zotregistry.dev/zot/pkg/api/controller.go:113\",\"time\":\"2022-04-10T23:08:15.926559322-07:00\",\"message\":\"configuration settings\"}\r\n{\"level\":\"info\",\"cpus\":8,\"max. open files\":1024,\"listen backlog\":\"4096\",\"max. inotify watches\":\"60023\",\"goroutine\":1,\"caller\":\"zotregistry.dev/zot/pkg/api/controller.go:101\",\"time\":\"2022-04-10T23:08:15.926650495-07:00\",\"message\":\"runtime params\"}\r\n"]
|
||||
[28.934316, "i", "\r"]
|
||||
[28.934806, "o", "\n"]
|
||||
[29.128211, "i", "\r"]
|
||||
|
|
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 180 KiB After Width: | Height: | Size: 180 KiB |
|
@ -7,7 +7,7 @@
|
|||
[1.100585, "o", "docker run -p 5000:5000 ghcr.io/project-zot/zot-linux-amd64:latest"]
|
||||
[1.442512, "i", "\r"]
|
||||
[1.44321, "o", "\r\n"]
|
||||
[1.863111, "o", "{\"level\":\"info\",\"params\":{\"distSpecVersion\":\"1.0.1\",\"GoVersion\":\"go1.17.5\",\"Commit\":\"v1.4.0-rc2-554e99a967b0e1fcc99eee2ec325e0aeda63d551\",\"BinaryType\":\"extended\",\"AccessControl\":null,\"Storage\":{\"Dedupe\":true,\"GC\":true,\"Commit\":false,\"GCDelay\":3600000000000,\"RootDirectory\":\"/var/lib/registry\",\"StorageDriver\":null,\"SubPaths\":null},\"HTTP\":{\"Address\":\"0.0.0.0\",\"Port\":\"5000\",\"AllowOrigin\":\"\",\"TLS\":null,\"Auth\":null,\"RawAccessControl\":null,\"Realm\":\"\",\"AllowReadAccess\":false,\"ReadOnly\":false,\"Ratelimit\":null},\"Log\":{\"Level\":\"debug\",\"Output\":\"\",\"Audit\":\"\"},\"Extensions\":null},\"goroutine\":1,\"caller\":\"zotregistry.dev/zot/pkg/api/controller.go:113\",\"time\":\"2022-04-11T06:24:52.513723934Z\",\"message\":\"configuration settings\"}\r\n{\"level\":\"info\",\"cpus\":8,\"max. open files\":1048576,\"listen backlog\":\"4096\",\"max. inotify watches\":\"60023\",\"goroutine\":1,\"caller\":\"zotregistry.dev/zot/pkg/api/controller.go:101\",\"time\":\"2022-04-11T06:24:52.513883845Z\",\"message\":\"runtime params\"}\r\n"]
|
||||
[1.863111, "o", "{\"level\":\"info\",\"params\":{\"distSpecVersion\":\"1.1.1\",\"GoVersion\":\"go1.17.5\",\"Commit\":\"v1.4.0-rc2-554e99a967b0e1fcc99eee2ec325e0aeda63d551\",\"BinaryType\":\"extended\",\"AccessControl\":null,\"Storage\":{\"Dedupe\":true,\"GC\":true,\"Commit\":false,\"GCDelay\":3600000000000,\"RootDirectory\":\"/var/lib/registry\",\"StorageDriver\":null,\"SubPaths\":null},\"HTTP\":{\"Address\":\"0.0.0.0\",\"Port\":\"5000\",\"AllowOrigin\":\"\",\"TLS\":null,\"Auth\":null,\"RawAccessControl\":null,\"Realm\":\"\",\"AllowReadAccess\":false,\"ReadOnly\":false,\"Ratelimit\":null},\"Log\":{\"Level\":\"debug\",\"Output\":\"\",\"Audit\":\"\"},\"Extensions\":null},\"goroutine\":1,\"caller\":\"zotregistry.dev/zot/pkg/api/controller.go:113\",\"time\":\"2022-04-11T06:24:52.513723934Z\",\"message\":\"configuration settings\"}\r\n{\"level\":\"info\",\"cpus\":8,\"max. open files\":1048576,\"listen backlog\":\"4096\",\"max. inotify watches\":\"60023\",\"goroutine\":1,\"caller\":\"zotregistry.dev/zot/pkg/api/controller.go:101\",\"time\":\"2022-04-11T06:24:52.513883845Z\",\"message\":\"runtime params\"}\r\n"]
|
||||
[3.289008, "i", "\u0001"]
|
||||
[3.679271, "i", "d"]
|
||||
[3.679735, "o", "\u001b[?1l\u001b>\u001b[38;1H\r\n\u001b[?1049l\u001b[23;0;0t"]
|
||||
|
|
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"dedupe": true,
|
||||
"remoteCache": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"commit": true
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
distspecversion: 1.1.0
|
||||
distspecversion: 1.1.1
|
||||
http:
|
||||
address: 127.0.0.1
|
||||
auth:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": true
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/data"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"dedupe": true,
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"dedupe": true,
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"dedupe": true,
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": false,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot"
|
||||
},
|
||||
|
|
|
@ -45,7 +45,7 @@ metadata:
|
|||
data:
|
||||
zot_config.json: |
|
||||
{
|
||||
"distSpecVersion":"1.0.1",
|
||||
"distSpecVersion":"1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/var/lib/registry"
|
||||
},
|
||||
|
@ -85,7 +85,7 @@ data:
|
|||
}
|
||||
zot_minimal.json: |
|
||||
{
|
||||
"distSpecVersion":"1.0.1",
|
||||
"distSpecVersion":"1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/var/lib/registry"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": false,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": false,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": false,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": false,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": false,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"dedupe": false,
|
||||
|
|
6
go.mod
6
go.mod
|
@ -48,15 +48,16 @@ require (
|
|||
github.com/notaryproject/notation-core-go v1.2.0
|
||||
github.com/notaryproject/notation-go v1.3.1
|
||||
github.com/olekukonko/tablewriter v0.0.5
|
||||
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20240201174943-0f98d91a0afe
|
||||
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20250123160558-a139cc423184
|
||||
github.com/opencontainers/go-digest v1.0.0
|
||||
github.com/opencontainers/image-spec v1.1.0
|
||||
github.com/opencontainers/image-spec v1.1.1
|
||||
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
|
||||
github.com/project-zot/mockoidc v0.0.0-20240610203808-d69d9e02020a
|
||||
github.com/prometheus/client_golang v1.20.5
|
||||
github.com/prometheus/client_model v0.6.1
|
||||
github.com/redis/go-redis/v9 v9.7.1
|
||||
github.com/rs/zerolog v1.33.0
|
||||
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
|
||||
github.com/sigstore/cosign/v2 v2.4.2
|
||||
github.com/sigstore/sigstore v1.8.15
|
||||
github.com/smartystreets/goconvey v1.8.1
|
||||
|
@ -410,7 +411,6 @@ require (
|
|||
github.com/sagikazarmark/locafero v0.6.0 // indirect
|
||||
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
|
||||
github.com/samber/lo v1.49.0 // indirect
|
||||
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
|
||||
github.com/sassoftware/go-rpmutils v0.4.0 // indirect
|
||||
github.com/sassoftware/relic v7.2.1+incompatible // indirect
|
||||
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
|
||||
|
|
8
go.sum
8
go.sum
|
@ -1777,12 +1777,12 @@ github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
|
|||
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
|
||||
github.com/open-policy-agent/opa v1.1.0 h1:HMz2evdEMTyNqtdLjmu3Vyx06BmhNYAx67Yz3Ll9q2s=
|
||||
github.com/open-policy-agent/opa v1.1.0/go.mod h1:T1pASQ1/vwfTa+e2fYcfpLCvWgYtqtiUv+IuA/dLPQs=
|
||||
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20240201174943-0f98d91a0afe h1:Gu7JiAGBfMlKG7WsuAqqRBJjDGwEg0RU2NvX1za2Pk4=
|
||||
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20240201174943-0f98d91a0afe/go.mod h1:Va0IMqkjv62YSEytL4sgxrkiD9IzU0T0bX/ZZEtMnSQ=
|
||||
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20250123160558-a139cc423184 h1:4fMydcL7sQjWQPMmzTLpRtsKl5KQdZVNcvPoYwpr4G4=
|
||||
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20250123160558-a139cc423184/go.mod h1:Va0IMqkjv62YSEytL4sgxrkiD9IzU0T0bX/ZZEtMnSQ=
|
||||
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
|
||||
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
|
||||
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
|
||||
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
|
||||
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
|
||||
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
|
||||
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
|
||||
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
|
||||
github.com/opencontainers/runtime-tools v0.9.1-0.20241108202711-f7e3563b0271 h1:TPj0pMLCTy1CKwmrat3hqTxoZfqOuTy0asG0ccpGk8Q=
|
||||
|
|
|
@ -301,7 +301,7 @@ func TestRedisOptions(t *testing.T) {
|
|||
|
||||
Convey("Test redis options from json", func(c C) {
|
||||
fileContent := []byte(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"remoteCache": true,
|
||||
"cacheDriver": {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
// @title Open Container Initiative Distribution Specification
|
||||
// @version v1.1.0
|
||||
// @version v1.1.1
|
||||
// @description APIs for Open Container Initiative Distribution Specification
|
||||
|
||||
// @license.name Apache 2.0
|
||||
|
|
|
@ -37,7 +37,7 @@ func TestConfigReloader(t *testing.T) {
|
|||
defer os.Remove(logFile.Name()) // clean up
|
||||
|
||||
content := fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s"
|
||||
},
|
||||
|
@ -96,7 +96,7 @@ func TestConfigReloader(t *testing.T) {
|
|||
test.WaitTillServerReady(baseURL)
|
||||
|
||||
content = fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s"
|
||||
},
|
||||
|
@ -169,7 +169,7 @@ func TestConfigReloader(t *testing.T) {
|
|||
defer os.Remove(logFile.Name()) // clean up
|
||||
|
||||
content := fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s",
|
||||
"gc": false,
|
||||
|
@ -213,7 +213,7 @@ func TestConfigReloader(t *testing.T) {
|
|||
test.WaitTillServerReady(baseURL)
|
||||
|
||||
content = fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s",
|
||||
"gc": true,
|
||||
|
@ -276,7 +276,7 @@ func TestConfigReloader(t *testing.T) {
|
|||
defer os.Remove(logFile.Name()) // clean up
|
||||
|
||||
content := fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s"
|
||||
},
|
||||
|
@ -332,7 +332,7 @@ func TestConfigReloader(t *testing.T) {
|
|||
test.WaitTillServerReady(baseURL)
|
||||
|
||||
content = fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s"
|
||||
},
|
||||
|
@ -409,7 +409,7 @@ func TestConfigReloader(t *testing.T) {
|
|||
defer os.Remove(logFile.Name()) // clean up
|
||||
|
||||
content := fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s"
|
||||
},
|
||||
|
@ -455,7 +455,7 @@ func TestConfigReloader(t *testing.T) {
|
|||
test.WaitTillServerReady(baseURL)
|
||||
|
||||
content = fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s"
|
||||
},
|
||||
|
@ -525,7 +525,7 @@ func TestConfigReloader(t *testing.T) {
|
|||
defer os.Remove(logFile.Name()) // clean up
|
||||
|
||||
content := fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s"
|
||||
},
|
||||
|
|
|
@ -1468,7 +1468,7 @@ func TestOverlappingSyncRetentionConfig(t *testing.T) {
|
|||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := `{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s",
|
||||
"gc": true,
|
||||
|
@ -1537,7 +1537,7 @@ func TestOverlappingSyncRetentionConfig(t *testing.T) {
|
|||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := `{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s",
|
||||
"gc": true,
|
||||
|
@ -1604,7 +1604,7 @@ func TestOverlappingSyncRetentionConfig(t *testing.T) {
|
|||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := `{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s",
|
||||
"gc": true,
|
||||
|
@ -1669,7 +1669,7 @@ func TestOverlappingSyncRetentionConfig(t *testing.T) {
|
|||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := `{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s",
|
||||
"gc": true,
|
||||
|
@ -1743,7 +1743,7 @@ func TestSyncWithRemoteStorageConfig(t *testing.T) {
|
|||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := `{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s",
|
||||
"dedupe": false,
|
||||
|
@ -1812,7 +1812,7 @@ func TestSyncWithRemoteStorageConfig(t *testing.T) {
|
|||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s",
|
||||
"dedupe": false,
|
||||
|
@ -1884,7 +1884,7 @@ func TestSyncWithRemoteStorageConfig(t *testing.T) {
|
|||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s",
|
||||
"subPaths":{
|
||||
|
|
|
@ -90,7 +90,7 @@ func TestServe(t *testing.T) {
|
|||
|
||||
// missing storage config should result in an error in Controller.Init()
|
||||
content := []byte(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"http": {
|
||||
"address":"127.0.0.1",
|
||||
"port":"8080"
|
||||
|
@ -142,7 +142,7 @@ func TestVerify(t *testing.T) {
|
|||
|
||||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
|
||||
content := []byte(`{"distSpecVersion":"1.1.1","storage":{"rootDirectory":"/tmp/zot"},
|
||||
"http":{"address":"127.0.0.1","port":"8080","realm":"zot"},
|
||||
"log":{"level":"debug"}}`)
|
||||
_, err = tmpfile.Write(content)
|
||||
|
@ -162,7 +162,7 @@ func TestVerify(t *testing.T) {
|
|||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := []byte(`
|
||||
distspecversion: 1.1.0
|
||||
distspecversion: 1.1.1
|
||||
http:
|
||||
address: 127.0.0.1
|
||||
port: 8080
|
||||
|
@ -579,7 +579,7 @@ storage:
|
|||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := []byte(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"gc": true,
|
||||
|
@ -631,7 +631,7 @@ storage:
|
|||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := []byte(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"gc": true,
|
||||
|
@ -1196,7 +1196,7 @@ storage:
|
|||
|
||||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
|
||||
content := []byte(`{"distSpecVersion":"1.1.1","storage":{"rootDirectory":"/tmp/zot"},
|
||||
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
|
||||
"auth":{"openid":{"providers":{"oidc":{"issuer":"http://127.0.0.1:5556/dex"}}}}},
|
||||
"log":{"level":"debug"}}`)
|
||||
|
@ -1216,7 +1216,7 @@ storage:
|
|||
|
||||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
|
||||
content := []byte(`{"distSpecVersion":"1.1.1","storage":{"rootDirectory":"/tmp/zot"},
|
||||
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
|
||||
"auth":{"openid":{"providers":{"github":{"clientid":"client_id"}}}}},
|
||||
"log":{"level":"debug"}}`)
|
||||
|
@ -1236,7 +1236,7 @@ storage:
|
|||
|
||||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
|
||||
content := []byte(`{"distSpecVersion":"1.1.1","storage":{"rootDirectory":"/tmp/zot"},
|
||||
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
|
||||
"auth":{"openid":{"providers":{"unsupported":{"issuer":"http://127.0.0.1:5556/dex"}}}}},
|
||||
"log":{"level":"debug"}}`)
|
||||
|
@ -1256,7 +1256,7 @@ storage:
|
|||
|
||||
defer os.Remove(tmpfile.Name()) // clean up
|
||||
|
||||
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
|
||||
content := []byte(`{"distSpecVersion":"1.1.1","storage":{"rootDirectory":"/tmp/zot"},
|
||||
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
|
||||
"auth":{"openid":{"providers":{"oidc":{"issuer":"http://127.0.0.1:5556/dex",
|
||||
"clientid":"client_id","scopes":["openid"]}}}}},
|
||||
|
@ -1369,7 +1369,7 @@ storage:
|
|||
err = tmpCredsFile.Close()
|
||||
So(err, ShouldBeNil)
|
||||
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.0-dev",
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.1",
|
||||
"storage": { "rootDirectory": "/tmp/zot" }, "http": { "address": "127.0.0.1", "port": "8080",
|
||||
"auth":{"htpasswd":{"path":"test/data/htpasswd"}, "sessionKeysFile": "%s",
|
||||
"failDelay": 5 } }, "log": { "level": "debug" } }`,
|
||||
|
@ -1404,7 +1404,7 @@ storage:
|
|||
err = tmpCredsFile.Close()
|
||||
So(err, ShouldBeNil)
|
||||
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.0-dev",
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.1",
|
||||
"storage": { "rootDirectory": "/tmp/zot" }, "http": { "address": "127.0.0.1", "port": "8080",
|
||||
"auth":{"htpasswd":{"path":"test/data/htpasswd"}, "sessionKeysFile": "%s",
|
||||
"failDelay": 5 } }, "log": { "level": "debug" } }`,
|
||||
|
@ -1440,7 +1440,7 @@ storage:
|
|||
err = tmpCredsFile.Close()
|
||||
So(err, ShouldBeNil)
|
||||
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.0-dev",
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.1",
|
||||
"storage": { "rootDirectory": "/tmp/zot" }, "http": { "address": "127.0.0.1", "port": "8080",
|
||||
"auth": { "ldap": { "credentialsFile": "%v", "address": "ldap.example.org", "port": 389,
|
||||
"startTLS": false, "baseDN": "ou=Users,dc=example,dc=org",
|
||||
|
@ -1478,7 +1478,7 @@ storage:
|
|||
err = tmpCredsFile.Close()
|
||||
So(err, ShouldBeNil)
|
||||
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.0-dev",
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.1",
|
||||
"storage": { "rootDirectory": "/tmp/zot" }, "http": { "address": "127.0.0.1", "port": "8080",
|
||||
"auth": { "ldap": { "credentialsFile": "%v", "address": "ldap.example.org", "port": 389,
|
||||
"startTLS": false, "baseDN": "ou=Users,dc=example,dc=org",
|
||||
|
@ -1518,7 +1518,7 @@ storage:
|
|||
err = tmpCredsFile.Close()
|
||||
So(err, ShouldBeNil)
|
||||
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.0-dev",
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.1",
|
||||
"storage": { "rootDirectory": "/tmp/zot" }, "http": { "address": "127.0.0.1", "port": "8080",
|
||||
"auth": { "ldap": { "credentialsFile": "%v", "address": "ldap.example.org", "port": 389,
|
||||
"startTLS": false, "baseDN": "ou=Users,dc=example,dc=org",
|
||||
|
@ -1555,7 +1555,7 @@ storage:
|
|||
err = tmpCredsFile.Close()
|
||||
So(err, ShouldBeNil)
|
||||
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.0-dev",
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.1",
|
||||
"storage": { "rootDirectory": "/tmp/zot" }, "http": { "address": "127.0.0.1", "port": "8080",
|
||||
"auth": { "ldap": { "credentialsFile": "%v", "address": "ldap.example.org", "port": 389,
|
||||
"startTLS": false, "baseDN": "ou=Users,dc=example,dc=org",
|
||||
|
@ -1592,7 +1592,7 @@ storage:
|
|||
err = tmpCredsFile.Close()
|
||||
So(err, ShouldBeNil)
|
||||
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.0-dev",
|
||||
content = []byte(fmt.Sprintf(`{ "distSpecVersion": "1.1.1",
|
||||
"storage": { "rootDirectory": "/tmp/zot" }, "http": { "address": "127.0.0.1", "port": "8080",
|
||||
"auth": { "ldap": { "credentialsFile": "%v", "address": "ldap.example.org", "port": 389,
|
||||
"startTLS": false, "baseDN": "ou=Users,dc=example,dc=org",
|
||||
|
@ -1621,7 +1621,7 @@ func TestApiKeyConfig(t *testing.T) {
|
|||
|
||||
defer os.Remove(tmpfile.Name())
|
||||
|
||||
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
|
||||
content := []byte(`{"distSpecVersion":"1.1.1","storage":{"rootDirectory":"/tmp/zot"},
|
||||
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
|
||||
"auth":{"openid":{"providers":{"oidc":{"issuer":"http://127.0.0.1:5556/dex",
|
||||
"clientid":"client_id","scopes":["openid"]}}}}},
|
||||
|
@ -1642,7 +1642,7 @@ func TestApiKeyConfig(t *testing.T) {
|
|||
|
||||
defer os.Remove(tmpfile.Name())
|
||||
|
||||
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
|
||||
content := []byte(`{"distSpecVersion":"1.1.1","storage":{"rootDirectory":"/tmp/zot"},
|
||||
"http":{"address":"127.0.0.1","port":"8080","realm":"zot"},
|
||||
"log":{"level":"debug"}}`)
|
||||
|
||||
|
@ -1661,7 +1661,7 @@ func TestApiKeyConfig(t *testing.T) {
|
|||
|
||||
defer os.Remove(tmpfile.Name())
|
||||
|
||||
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
|
||||
content := []byte(`{"distSpecVersion":"1.1.1","storage":{"rootDirectory":"/tmp/zot"},
|
||||
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
|
||||
"auth":{"htpasswd":{"path":"test/data/htpasswd"}}},
|
||||
"log":{"level":"debug"}}`)
|
||||
|
|
|
@ -23,7 +23,7 @@ curl http://localhost:8080/v2/_zot/ext/mgmt | jq
|
|||
|
||||
```json
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"binaryType": "-sync-search-scrub-metrics-lint-ui-mgmt",
|
||||
"http": {
|
||||
"auth": {
|
||||
|
|
|
@ -2058,7 +2058,7 @@ func TestConfigReloader(t *testing.T) {
|
|||
|
||||
//nolint: dupl
|
||||
Convey("Reload config without sync", func() {
|
||||
content := fmt.Sprintf(`{"distSpecVersion": "1.1.0", "storage": {"rootDirectory": "%s"},
|
||||
content := fmt.Sprintf(`{"distSpecVersion": "1.1.1", "storage": {"rootDirectory": "%s"},
|
||||
"http": {"address": "127.0.0.1", "port": "%s"},
|
||||
"log": {"level": "debug", "output": "%s"}}`, destDir, destPort, logFile.Name())
|
||||
|
||||
|
@ -2116,7 +2116,7 @@ func TestConfigReloader(t *testing.T) {
|
|||
|
||||
// reload config from extensions nil to sync
|
||||
content = fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s"
|
||||
},
|
||||
|
@ -2176,7 +2176,7 @@ func TestConfigReloader(t *testing.T) {
|
|||
//nolint: dupl
|
||||
Convey("Reload bad sync config", func() {
|
||||
content := fmt.Sprintf(`{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "%s"
|
||||
},
|
||||
|
|
|
@ -18,6 +18,7 @@ import (
|
|||
"github.com/opencontainers/image-spec/schema"
|
||||
imeta "github.com/opencontainers/image-spec/specs-go"
|
||||
ispec "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/santhosh-tekuri/jsonschema/v5"
|
||||
|
||||
zerr "zotregistry.dev/zot/errors"
|
||||
zcommon "zotregistry.dev/zot/pkg/common"
|
||||
|
@ -30,7 +31,7 @@ import (
|
|||
)
|
||||
|
||||
const (
|
||||
manifestWithEmptyLayersErrMsg = "layers: Array must have at least 1 items"
|
||||
manifestWithEmptyLayersErrMsg = "layers/minItems: minimum 1 items required, but found 0 items"
|
||||
cosignSignatureTagSuffix = "sig"
|
||||
)
|
||||
|
||||
|
@ -848,9 +849,9 @@ func ValidateImageIndexSchema(buf []byte) error {
|
|||
}
|
||||
|
||||
func IsEmptyLayersError(err error) bool {
|
||||
var validationErr schema.ValidationError
|
||||
var validationErr *jsonschema.ValidationError
|
||||
if errors.As(err, &validationErr) {
|
||||
if len(validationErr.Errs) == 1 && strings.Contains(err.Error(), manifestWithEmptyLayersErrMsg) {
|
||||
if len(validationErr.Causes) == 1 && strings.Contains(err.Error(), manifestWithEmptyLayersErrMsg) {
|
||||
return true
|
||||
} else {
|
||||
return false
|
||||
|
|
|
@ -103,7 +103,7 @@ func TestValidateManifest(t *testing.T) {
|
|||
|
||||
So(errors.As(err, &internalErr), ShouldBeTrue)
|
||||
So(internalErr.GetDetails(), ShouldContainKey, "jsonSchemaValidation")
|
||||
So(internalErr.GetDetails()["jsonSchemaValidation"], ShouldEqual, "[schemaVersion: Must be less than or equal to 2]")
|
||||
So(internalErr.GetDetails()["jsonSchemaValidation"], ShouldContainSubstring, "must be <= 2 but found 999")
|
||||
})
|
||||
|
||||
Convey("bad config blob", func() {
|
||||
|
@ -165,6 +165,25 @@ func TestValidateManifest(t *testing.T) {
|
|||
_, _, err = imgStore.PutImageManifest("test", "1.0", ispec.MediaTypeImageManifest, body)
|
||||
So(err, ShouldBeNil)
|
||||
})
|
||||
|
||||
Convey("manifest with empty layers should not error", func() {
|
||||
manifest := ispec.Manifest{
|
||||
Config: ispec.Descriptor{
|
||||
MediaType: ispec.MediaTypeImageConfig,
|
||||
Digest: cdigest,
|
||||
Size: int64(len(cblob)),
|
||||
},
|
||||
Layers: []ispec.Descriptor{},
|
||||
}
|
||||
|
||||
manifest.SchemaVersion = 2
|
||||
|
||||
body, err := json.Marshal(manifest)
|
||||
So(err, ShouldBeNil)
|
||||
|
||||
_, _, err = imgStore.PutImageManifest("test", "1.0", ispec.MediaTypeImageManifest, body)
|
||||
So(err, ShouldBeNil)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
@ -1440,7 +1440,7 @@ const docTemplate = `{
|
|||
|
||||
// SwaggerInfo holds exported Swagger Info so clients can modify it
|
||||
var SwaggerInfo = &swag.Spec{
|
||||
Version: "v1.1.0",
|
||||
Version: "v1.1.1",
|
||||
Host: "",
|
||||
BasePath: "",
|
||||
Schemes: []string{},
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
"name": "Apache 2.0",
|
||||
"url": "http://www.apache.org/licenses/LICENSE-2.0.html"
|
||||
},
|
||||
"version": "v1.1.0"
|
||||
"version": "v1.1.1"
|
||||
},
|
||||
"paths": {
|
||||
"/v2/": {
|
||||
|
|
|
@ -245,7 +245,7 @@ info:
|
|||
name: Apache 2.0
|
||||
url: http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
title: Open Container Initiative Distribution Specification
|
||||
version: v1.1.0
|
||||
version: v1.1.1
|
||||
paths:
|
||||
/v2/:
|
||||
get:
|
||||
|
|
|
@ -39,7 +39,7 @@ function setup_file() {
|
|||
echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port
|
||||
cat > ${zot_config_file}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}"
|
||||
},
|
||||
|
|
|
@ -33,7 +33,7 @@ function setup_file() {
|
|||
htpasswd -Bbn ${AUTH_USER} ${AUTH_PASS} >> ${zot_htpasswd_file}
|
||||
cat > ${zot_config_file}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}"
|
||||
},
|
||||
|
|
|
@ -21,7 +21,7 @@ function setup() {
|
|||
|
||||
cat > ${zot_config_file}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}",
|
||||
"dedupe": true,
|
||||
|
|
|
@ -35,7 +35,7 @@ function setup_file() {
|
|||
echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port
|
||||
cat >${zot_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}"
|
||||
},
|
||||
|
|
|
@ -36,7 +36,7 @@ function setup_file() {
|
|||
echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port
|
||||
cat >${zot_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${ZOT_ROOT_DIR}"
|
||||
},
|
||||
|
|
|
@ -34,7 +34,7 @@ function setup_file() {
|
|||
htpasswd -Bbn ${AUTH_USER} ${AUTH_PASS} >> ${zot_htpasswd_file}
|
||||
cat > ${zot_config_file}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}"
|
||||
},
|
||||
|
|
|
@ -35,7 +35,7 @@ function setup_file() {
|
|||
echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port
|
||||
cat > ${zot_config_file}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}"
|
||||
},
|
||||
|
|
|
@ -32,7 +32,7 @@ function setup_file() {
|
|||
mkdir -p ${oci_data_dir}
|
||||
cat > ${zot_config_file}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}",
|
||||
"gc": true,
|
||||
|
|
|
@ -44,7 +44,7 @@ function setup_file() {
|
|||
htpasswd -Bbn ${AUTH_USER} ${AUTH_PASS} >> ${zot_htpasswd_file}
|
||||
cat > ${zot_config_file}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}"
|
||||
},
|
||||
|
|
|
@ -40,7 +40,7 @@ function setup_file() {
|
|||
touch ${zot_log_file}
|
||||
cat >${zot_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}"
|
||||
},
|
||||
|
|
|
@ -40,7 +40,7 @@ function setup_file() {
|
|||
touch ${zot_log_file}
|
||||
cat >${zot_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}"
|
||||
},
|
||||
|
|
|
@ -28,7 +28,7 @@ function setup_file() {
|
|||
echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port
|
||||
cat > ${zot_config_file}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}"
|
||||
},
|
||||
|
|
|
@ -35,7 +35,7 @@ function setup_file() {
|
|||
echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port
|
||||
cat > ${zot_config_file}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}"
|
||||
},
|
||||
|
|
|
@ -42,7 +42,7 @@ function setup_file() {
|
|||
|
||||
cat > ${zot_config_file}<<EOF
|
||||
{
|
||||
"distSpecVersion":"1.1.0",
|
||||
"distSpecVersion":"1.1.1",
|
||||
"storage":{
|
||||
"dedupe": true,
|
||||
"gc": true,
|
||||
|
|
|
@ -33,7 +33,7 @@ function setup_file() {
|
|||
mkdir -p ${oci_data_dir}
|
||||
cat > ${zot_config_file}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}",
|
||||
"dedupe": false,
|
||||
|
|
|
@ -47,7 +47,7 @@ function setup_file() {
|
|||
|
||||
cat >${zot_sync_ondemand_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}",
|
||||
"cacheDriver": {
|
||||
|
|
|
@ -38,7 +38,7 @@ function setup_file() {
|
|||
|
||||
cat >${zot_sync_ondemand_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"dedupe": true,
|
||||
"gc": true,
|
||||
|
|
|
@ -38,7 +38,7 @@ function setup() {
|
|||
echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port
|
||||
cat >${ZOT_CONFIG_FILE} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${ZOT_ROOT_DIR}"
|
||||
},
|
||||
|
|
|
@ -25,7 +25,7 @@ function setup_file() {
|
|||
|
||||
cat > ${zot_config_file_dedupe}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}",
|
||||
"dedupe": true,
|
||||
|
@ -59,7 +59,7 @@ EOF
|
|||
|
||||
cat > ${zot_config_file_nodedupe}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}",
|
||||
"dedupe": false,
|
||||
|
|
|
@ -30,7 +30,7 @@ function setup() {
|
|||
touch ${ZOT_LOG_FILE}
|
||||
cat >${ZOT_CONFIG_FILE} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${ZOT_ROOT_DIR}",
|
||||
"dedupe": false
|
||||
|
|
|
@ -56,7 +56,7 @@ function setup_file() {
|
|||
|
||||
cat >${zot_sync_per_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_sync_per_root_dir}"
|
||||
},
|
||||
|
@ -91,7 +91,7 @@ EOF
|
|||
|
||||
cat >${zot_sync_ondemand_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_sync_ondemand_root_dir}"
|
||||
},
|
||||
|
@ -124,7 +124,7 @@ EOF
|
|||
EOF
|
||||
cat >${zot_minimal_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_minimal_root_dir}"
|
||||
},
|
||||
|
|
|
@ -56,7 +56,7 @@ function setup_file() {
|
|||
|
||||
cat >${zot_sync_per_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_sync_per_root_dir}",
|
||||
"dedupe": false,
|
||||
|
@ -103,7 +103,7 @@ EOF
|
|||
|
||||
cat >${zot_sync_ondemand_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_sync_ondemand_root_dir}",
|
||||
"dedupe": false,
|
||||
|
@ -148,7 +148,7 @@ EOF
|
|||
EOF
|
||||
cat >${zot_minimal_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_minimal_root_dir}"
|
||||
},
|
||||
|
|
|
@ -39,7 +39,7 @@ function setup_file() {
|
|||
|
||||
cat >${zot_sync_ondemand_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}"
|
||||
},
|
||||
|
|
|
@ -34,7 +34,7 @@ function setup_file() {
|
|||
|
||||
cat >${zot_sync_per_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_sync_per_root_dir}"
|
||||
},
|
||||
|
@ -70,7 +70,7 @@ EOF
|
|||
|
||||
cat >${zot_minimal_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_minimal_root_dir}"
|
||||
},
|
||||
|
|
|
@ -48,7 +48,7 @@ function setup_file() {
|
|||
|
||||
cat >${zot_sync_one_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_sync_one_root_dir}"
|
||||
},
|
||||
|
@ -84,7 +84,7 @@ EOF
|
|||
|
||||
cat >${zot_sync_two_config_file} <<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_sync_two_root_dir}"
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot",
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot/local",
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot/s3",
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot/s3",
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot/local",
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot/s3",
|
||||
"gc": true,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "/tmp/zot/s3",
|
||||
"gc": true,
|
||||
|
|
|
@ -193,7 +193,7 @@ function create_zot_cloud_base_config_file() {
|
|||
|
||||
cat > ${zot_config_file}<<EOF
|
||||
{
|
||||
"distSpecVersion": "1.1.0",
|
||||
"distSpecVersion": "1.1.1",
|
||||
"storage": {
|
||||
"rootDirectory": "${zot_root_dir}",
|
||||
"dedupe": false,
|
||||
|
|
Loading…
Add table
Reference in a new issue