Infrastructure/zot
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2024-12-16 21:56:37 -05:00
Code Issues Activity

chore: update image-spec and dist spec to 1.1.0 (#2255)

Browse source 
BREAKING CHANGE: the dist spec version in the config files needs to be bumped to 1.1.0
in order for the config verification to pass without warnings.

Also fix 1 dependabot alert for helm.

Signed-off-by: Andrei Aaron <aaaron@luxoft.com>
This commit is contained in:
Andrei Aaron 2024-02-20 13:27:21 +02:00 committed by GitHub
parent 960686b957
commit 4e5db84cb1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
74 changed files with 117 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
THIRD-PARTY-LICENSES.md
View file

@ -296,10 +296,10 @@ github.com/nozzle/throttler|https://github.com/nozzle/throttler/blob/2ea98225148
github.com/oklog/ulid|https://github.com/oklog/ulid/blob/v1.3.1/LICENSE|Apache-2.0
github.com/oleiade/reflections|https://github.com/oleiade/reflections/blob/v1.0.1/LICENSE|MIT
github.com/olekukonko/tablewriter|https://github.com/olekukonko/tablewriter/blob/v0.0.5/LICENSE.md|MIT
github.com/opencontainers/distribution-spec/specs-go|https://github.com/opencontainers/distribution-spec/blob/067a0f5b0e25/specs-go/LICENSE|Apache-2.0
github.com/opencontainers/distribution-spec/specs-go|https://github.com/opencontainers/distribution-spec/blob/0f98d91a0afe/specs-go/LICENSE|Apache-2.0
github.com/opencontainers/go-digest|https://github.com/opencontainers/go-digest/blob/v1.0.0/LICENSE|Apache-2.0
github.com/opencontainers/image-spec/specs-go|https://github.com/opencontainers/image-spec/blob/v1.1.0-rc6/LICENSE|Apache-2.0
github.com/opencontainers/image-spec|https://github.com/opencontainers/image-spec/blob/v1.1.0-rc6/LICENSE|Apache-2.0
github.com/opencontainers/image-spec/specs-go|https://github.com/opencontainers/image-spec/blob/v1.1.0/LICENSE|Apache-2.0
github.com/opencontainers/image-spec|https://github.com/opencontainers/image-spec/blob/v1.1.0/LICENSE|Apache-2.0
github.com/opencontainers/runtime-spec/specs-go|https://github.com/opencontainers/runtime-spec/blob/v1.1.0/LICENSE|Apache-2.0
github.com/opencontainers/selinux|https://github.com/opencontainers/selinux/blob/v1.11.0/LICENSE|Apache-2.0
github.com/opentracing/opentracing-go|https://github.com/opentracing/opentracing-go/blob/v1.2.0/LICENSE|Apache-2.0

2
examples/config-all-remote.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"dedupe": true,
"remoteCache": true,

2
examples/config-allextensions.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-anonymous-authz.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-bearer-auth.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-bench.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-boltdb.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true,

2
examples/config-commit.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"commit": true

2
examples/config-conformance.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,

2
examples/config-cve.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-dynamodb.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true,

2
examples/config-example.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-example.yaml
View file

@ -1,4 +1,4 @@
distspecversion: 1.1.0-dev
distspecversion: 1.1.0
http:
address: 127.0.0.1
auth:

2
examples/config-gc-periodic.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,

2
examples/config-gc.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,

2
examples/config-ldap.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-lint.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-metrics-authz.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-metrics.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-minimal.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-multiple-cve.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true,

2
examples/config-multiple.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true,

2
examples/config-openid.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true

2
examples/config-policy.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-popular-registries.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/data"
},

2
examples/config-ratelimit.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-retention.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,

2
examples/config-s3.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true,

2
examples/config-scheduler.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-scrub.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-search.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-sync-cloud-storage.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true,

2
examples/config-sync.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-test.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-tls.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

2
examples/config-ui.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},

6
go.mod
View file

@ -27,7 +27,7 @@ require (
github.com/nmcclain/ldap v0.0.0-20210720162743-7f8d1e44eeba
github.com/olekukonko/tablewriter v0.0.5
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0-rc6
github.com/opencontainers/image-spec v1.1.0
github.com/oras-project/artifacts-spec v1.0.0-rc.2
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
github.com/prometheus/client_golang v1.18.0
@ -56,7 +56,7 @@ require (
github.com/gorilla/sessions v1.2.2
github.com/migueleliasweb/go-github-mock v0.0.22
github.com/notaryproject/notation-go v1.1.0
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20230117141039-067a0f5b0e25
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20240201174943-0f98d91a0afe
github.com/project-zot/mockoidc v0.0.0-20230307111146-f607b4b5fb97
github.com/sigstore/cosign/v2 v2.2.3
github.com/swaggo/http-swagger v1.3.4
@ -220,7 +220,7 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
gopkg.in/go-jose/go-jose.v2 v2.6.1 // indirect
helm.sh/helm/v3 v3.14.0 // indirect
helm.sh/helm/v3 v3.14.1 // indirect
k8s.io/apiextensions-apiserver v0.29.0 // indirect
k8s.io/apiserver v0.29.0 // indirect
k8s.io/cli-runtime v0.29.0 // indirect

12
go.sum
View file

@ -1240,12 +1240,12 @@ github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
github.com/open-policy-agent/opa v0.61.0 h1:nhncQ2CAYtQTV/SMBhDDPsCpCQsUW+zO/1j+T5V7oZg=
github.com/open-policy-agent/opa v0.61.0/go.mod h1:7OUuzJnsS9yHf8lw0ApfcbrnaRG1EkN3J2fuuqi4G/E=
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20230117141039-067a0f5b0e25 h1:DpApB9YKcjGF1Lc8FmEAD5Xa1LRhVftJGgpe3+47Vc0=
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20230117141039-067a0f5b0e25/go.mod h1:uLvbyisMXc6uWXBmKrPegq9igec91coS/kGM2sHL660=
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/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-rc6 h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU=
github.com/opencontainers/image-spec v1.1.0-rc6/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
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/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss=
github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8=
github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
@ -2236,8 +2236,8 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
helm.sh/helm/v3 v3.14.0 h1:TaZIH6uOchn7L27ptwnnuHJiFrT/BsD4dFdp/HLT2nM=
helm.sh/helm/v3 v3.14.0/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424=
helm.sh/helm/v3 v3.14.1 h1:4AwRLx+wfzlPtvrsbDmWP5PUokGmf9/nAmEdk21vae8=
helm.sh/helm/v3 v3.14.1/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

2
pkg/api/routes.go
View file

@ -1,5 +1,5 @@
// @title Open Container Initiative Distribution Specification
// @version v1.1.0-dev
// @version v1.1.0
// @description APIs for Open Container Initiative Distribution Specification
// @license.name Apache 2.0

18
pkg/cli/server/config_reloader_test.go
View file

@ -37,7 +37,7 @@ func TestConfigReloader(t *testing.T) {
defer os.Remove(logFile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@ -95,7 +95,7 @@ func TestConfigReloader(t *testing.T) {
test.WaitTillServerReady(baseURL)
content = fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@ -168,7 +168,7 @@ func TestConfigReloader(t *testing.T) {
defer os.Remove(logFile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"gc": false,
@ -211,7 +211,7 @@ func TestConfigReloader(t *testing.T) {
test.WaitTillServerReady(baseURL)
content = fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"gc": true,
@ -274,7 +274,7 @@ func TestConfigReloader(t *testing.T) {
defer os.Remove(logFile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@ -329,7 +329,7 @@ func TestConfigReloader(t *testing.T) {
test.WaitTillServerReady(baseURL)
content = fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@ -406,7 +406,7 @@ func TestConfigReloader(t *testing.T) {
defer os.Remove(logFile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@ -451,7 +451,7 @@ func TestConfigReloader(t *testing.T) {
test.WaitTillServerReady(baseURL)
content = fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@ -521,7 +521,7 @@ func TestConfigReloader(t *testing.T) {
defer os.Remove(logFile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},

14
pkg/cli/server/extensions_test.go
View file

@ -1401,7 +1401,7 @@ func TestOverlappingSyncRetentionConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := `{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"gc": true,
@ -1467,7 +1467,7 @@ func TestOverlappingSyncRetentionConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := `{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"gc": true,
@ -1531,7 +1531,7 @@ func TestOverlappingSyncRetentionConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := `{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"gc": true,
@ -1593,7 +1593,7 @@ func TestOverlappingSyncRetentionConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := `{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"gc": true,
@ -1665,7 +1665,7 @@ func TestSyncWithRemoteStorageConfig(t *testing.T) {
defer os.Remove(tmpfile.Name()) // clean up
content := `{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"dedupe": false,
@ -1729,7 +1729,7 @@ func TestSyncWithRemoteStorageConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"dedupe": false,
@ -1796,7 +1796,7 @@ func TestSyncWithRemoteStorageConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"subPaths":{

24
pkg/cli/server/root_test.go
View file

@ -78,7 +78,7 @@ func TestServe(t *testing.T) {
// missing storage config should result in an error in Controller.Init()
content := []byte(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"http": {
"address":"127.0.0.1",
"port":"8080"
@ -125,7 +125,7 @@ func TestVerify(t *testing.T) {
tmpfile, err := os.CreateTemp("", "zot-test*")
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
"http":{"address":"127.0.0.1","port":"8080","realm":"zot"},
"log":{"level":"debug"}}`)
_, err = tmpfile.Write(content)
@ -142,7 +142,7 @@ func TestVerify(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`
distspecversion: 1.1.0-dev
distspecversion: 1.1.0
http:
address: 127.0.0.1
port: 8080
@ -556,7 +556,7 @@ storage:
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,
@ -604,7 +604,7 @@ storage:
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,
@ -1105,7 +1105,7 @@ storage:
tmpfile, err := os.CreateTemp("", "zot-test*.json")
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","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"}}`)
@ -1122,7 +1122,7 @@ storage:
tmpfile, err := os.CreateTemp("", "zot-test*.json")
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
"auth":{"openid":{"providers":{"github":{"clientid":"client_id"}}}}},
"log":{"level":"debug"}}`)
@ -1139,7 +1139,7 @@ storage:
tmpfile, err := os.CreateTemp("", "zot-test*.json")
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","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"}}`)
@ -1156,7 +1156,7 @@ storage:
tmpfile, err := os.CreateTemp("", "zot-test*.json")
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","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"]}}}}},
@ -1245,7 +1245,7 @@ func TestApiKeyConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name())
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","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"]}}}}},
@ -1265,7 +1265,7 @@ func TestApiKeyConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name())
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
"http":{"address":"127.0.0.1","port":"8080","realm":"zot"},
"log":{"level":"debug"}}`)
@ -1283,7 +1283,7 @@ func TestApiKeyConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name())
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
"auth":{"htpasswd":{"path":"test/data/htpasswd"}}},
"log":{"level":"debug"}}`)

2
pkg/extensions/README_mgmt.md
View file

@ -23,7 +23,7 @@ curl http://localhost:8080/v2/_zot/ext/mgmt | jq
```json
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"binaryType": "-sync-search-scrub-metrics-lint-ui-mgmt",
"http": {
"auth": {

6
pkg/extensions/sync/sync_test.go
View file

@ -1888,7 +1888,7 @@ func TestConfigReloader(t *testing.T) {
//nolint: dupl
Convey("Reload config without sync", func() {
content := fmt.Sprintf(`{"distSpecVersion": "1.1.0-dev", "storage": {"rootDirectory": "%s"},
content := fmt.Sprintf(`{"distSpecVersion": "1.1.0", "storage": {"rootDirectory": "%s"},
"http": {"address": "127.0.0.1", "port": "%s"},
"log": {"level": "debug", "output": "%s"}}`, destDir, destPort, logFile.Name())
@ -1946,7 +1946,7 @@ func TestConfigReloader(t *testing.T) {
// reload config from extensions nil to sync
content = fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@ -2006,7 +2006,7 @@ func TestConfigReloader(t *testing.T) {
//nolint: dupl
Convey("Reload bad sync config", func() {
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},

2
swagger/docs.go
View file

@ -1495,7 +1495,7 @@ const docTemplate = `{
// SwaggerInfo holds exported Swagger Info so clients can modify it
var SwaggerInfo = &swag.Spec{
Version: "v1.1.0-dev",
Version: "v1.1.0",
Host: "",
BasePath: "",
Schemes: []string{},

2
swagger/swagger.json
View file

@ -8,7 +8,7 @@
"name": "Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.html"
},
"version": "v1.1.0-dev"
"version": "v1.1.0"
},
"paths": {
"/oras/artifacts/v1/{name}/manifests/{digest}/referrers": {

2
swagger/swagger.yaml
View file

@ -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-dev
version: v1.1.0
paths:
/oras/artifacts/v1/{name}/manifests/{digest}/referrers:
get:

2
test/blackbox/annotations.bats
View file

@ -39,7 +39,7 @@ function setup_file() {
echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port
cat > ${zot_config_file}<<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}"
},

2
test/blackbox/anonymous_policy.bats
View file

@ -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-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}"
},

2
test/blackbox/cloud_only.bats
View file

@ -21,7 +21,7 @@ function setup() {
cat > ${zot_config_file}<<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}",
"dedupe": true,

2
test/blackbox/cve.bats
View file

@ -35,7 +35,7 @@ function setup_file() {
echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port
cat >${zot_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}"
},

2
test/blackbox/delete_images.bats
View file

@ -36,7 +36,7 @@ function setup_file() {
echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port
cat >${zot_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${ZOT_ROOT_DIR}"
},

2
test/blackbox/detect_manifest_collision.bats
View file

@ -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-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}"
},

2
test/blackbox/metadata.bats
View file

@ -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-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}"
},

2
test/blackbox/metrics.bats
View file

@ -40,7 +40,7 @@ function setup_file() {
touch ${zot_log_file}
cat >${zot_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}"
},

2
test/blackbox/metrics_minimal.bats
View file

@ -40,7 +40,7 @@ function setup_file() {
touch ${zot_log_file}
cat >${zot_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}"
},

2
test/blackbox/pushpull.bats
View file

@ -35,7 +35,7 @@ function setup_file() {
echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port
cat > ${zot_config_file}<<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}"
},

2
test/blackbox/pushpull_authn.bats
View file

@ -42,7 +42,7 @@ function setup_file() {
cat > ${zot_config_file}<<EOF
{
"distSpecVersion":"1.1.0-dev",
"distSpecVersion":"1.1.0",
"storage":{
"dedupe": true,
"gc": true,

2
test/blackbox/pushpull_running_dedupe.bats
View file

@ -33,7 +33,7 @@ function setup_file() {
mkdir -p ${oci_data_dir}
cat > ${zot_config_file}<<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}",
"dedupe": false,

2
test/blackbox/referrers.bats
View file

@ -38,7 +38,7 @@ function setup() {
echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port
cat >${ZOT_CONFIG_FILE} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${ZOT_ROOT_DIR}"
},

4
test/blackbox/restore_s3_blobs.bats
View file

@ -25,7 +25,7 @@ function setup_file() {
cat > ${zot_config_file_dedupe}<<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}",
"dedupe": true,
@ -59,7 +59,7 @@ EOF
cat > ${zot_config_file_nodedupe}<<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}",
"dedupe": false,

2
test/blackbox/scrub.bats
View file

@ -30,7 +30,7 @@ function setup() {
touch ${ZOT_LOG_FILE}
cat >${ZOT_CONFIG_FILE} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${ZOT_ROOT_DIR}",
"dedupe": false

6
test/blackbox/sync.bats
View file

@ -56,7 +56,7 @@ function setup_file() {
cat >${zot_sync_per_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_sync_per_root_dir}"
},
@ -91,7 +91,7 @@ EOF
cat >${zot_sync_ondemand_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_sync_ondemand_root_dir}"
},
@ -124,7 +124,7 @@ EOF
EOF
cat >${zot_minimal_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_minimal_root_dir}"
},

6
test/blackbox/sync_cloud.bats
View file

@ -56,7 +56,7 @@ function setup_file() {
cat >${zot_sync_per_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"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-dev",
"distSpecVersion": "1.1.0",
"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-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_minimal_root_dir}"
},

2
test/blackbox/sync_docker.bats
View file

@ -39,7 +39,7 @@ function setup_file() {
cat >${zot_sync_ondemand_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_root_dir}"
},

4
test/blackbox/sync_harness.bats
View file

@ -34,7 +34,7 @@ function setup_file() {
cat >${zot_sync_per_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_sync_per_root_dir}"
},
@ -70,7 +70,7 @@ EOF
cat >${zot_minimal_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_minimal_root_dir}"
},

4
test/blackbox/sync_replica_cluster.bats
View file

@ -48,7 +48,7 @@ function setup_file() {
cat >${zot_sync_one_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_sync_one_root_dir}"
},
@ -84,7 +84,7 @@ EOF
cat >${zot_sync_two_config_file} <<EOF
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "${zot_sync_two_root_dir}"
},

2
test/cluster/config-minio.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,

2
test/gc-stress/config-gc-bench-local.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot/local",
"gc": true,

2
test/gc-stress/config-gc-bench-s3-localstack.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot/s3",
"gc": true,

2
test/gc-stress/config-gc-bench-s3-minio.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot/s3",
"gc": true,

2
test/gc-stress/config-gc-referrers-bench-local.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot/local",
"gc": true,

2
test/gc-stress/config-gc-referrers-bench-s3-localstack.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot/s3",
"gc": true,

2
test/gc-stress/config-gc-referrers-bench-s3-minio.json
View file

@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot/s3",
"gc": true,