diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md index 6d4bf31a..ae26d6c4 100644 --- a/THIRD-PARTY-LICENSES.md +++ b/THIRD-PARTY-LICENSES.md @@ -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 diff --git a/examples/config-all-remote.json b/examples/config-all-remote.json index 89b734a9..79dde31e 100644 --- a/examples/config-all-remote.json +++ b/examples/config-all-remote.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "dedupe": true, "remoteCache": true, diff --git a/examples/config-allextensions.json b/examples/config-allextensions.json index b5d91a8b..95f1752d 100644 --- a/examples/config-allextensions.json +++ b/examples/config-allextensions.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-anonymous-authz.json b/examples/config-anonymous-authz.json index f3178249..119d9931 100644 --- a/examples/config-anonymous-authz.json +++ b/examples/config-anonymous-authz.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-bearer-auth.json b/examples/config-bearer-auth.json index 3517137b..6704ea5f 100644 --- a/examples/config-bearer-auth.json +++ b/examples/config-bearer-auth.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-bench.json b/examples/config-bench.json index a0627f81..987e9098 100644 --- a/examples/config-bench.json +++ b/examples/config-bench.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-boltdb.json b/examples/config-boltdb.json index 3f274edd..164ab99e 100644 --- a/examples/config-boltdb.json +++ b/examples/config-boltdb.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot", "dedupe": true, diff --git a/examples/config-commit.json b/examples/config-commit.json index 9a79853e..33134ea2 100644 --- a/examples/config-commit.json +++ b/examples/config-commit.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot", "commit": true diff --git a/examples/config-conformance.json b/examples/config-conformance.json index f29364b4..e7ea90c6 100644 --- a/examples/config-conformance.json +++ b/examples/config-conformance.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot", "gc": true, diff --git a/examples/config-cve.json b/examples/config-cve.json index d08ae3cd..3b0d728d 100644 --- a/examples/config-cve.json +++ b/examples/config-cve.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-dynamodb.json b/examples/config-dynamodb.json index b269a047..e938bed8 100644 --- a/examples/config-dynamodb.json +++ b/examples/config-dynamodb.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot", "dedupe": true, diff --git a/examples/config-example.json b/examples/config-example.json index cf744d89..e61b97d4 100644 --- a/examples/config-example.json +++ b/examples/config-example.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-example.yaml b/examples/config-example.yaml index a627ad96..cdbe537d 100644 --- a/examples/config-example.yaml +++ b/examples/config-example.yaml @@ -1,4 +1,4 @@ -distspecversion: 1.1.0-dev +distspecversion: 1.1.0 http: address: 127.0.0.1 auth: diff --git a/examples/config-gc-periodic.json b/examples/config-gc-periodic.json index 8e44166c..aaa811f0 100644 --- a/examples/config-gc-periodic.json +++ b/examples/config-gc-periodic.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot", "gc": true, diff --git a/examples/config-gc.json b/examples/config-gc.json index 360d919c..7d0a38af 100644 --- a/examples/config-gc.json +++ b/examples/config-gc.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot", "gc": true, diff --git a/examples/config-ldap.json b/examples/config-ldap.json index 400ab88d..d7bc0f7f 100644 --- a/examples/config-ldap.json +++ b/examples/config-ldap.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-lint.json b/examples/config-lint.json index 065aefa8..f97194de 100644 --- a/examples/config-lint.json +++ b/examples/config-lint.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-metrics-authz.json b/examples/config-metrics-authz.json index efeb8ca2..96360315 100644 --- a/examples/config-metrics-authz.json +++ b/examples/config-metrics-authz.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-metrics.json b/examples/config-metrics.json index 7ec5845c..5b49b681 100644 --- a/examples/config-metrics.json +++ b/examples/config-metrics.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-minimal.json b/examples/config-minimal.json index 49f519f5..6b058798 100644 --- a/examples/config-minimal.json +++ b/examples/config-minimal.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-multiple-cve.json b/examples/config-multiple-cve.json index fcb35bc3..633c5836 100644 --- a/examples/config-multiple-cve.json +++ b/examples/config-multiple-cve.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot", "dedupe": true, diff --git a/examples/config-multiple.json b/examples/config-multiple.json index c1463767..4c2f58fb 100644 --- a/examples/config-multiple.json +++ b/examples/config-multiple.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot", "dedupe": true, diff --git a/examples/config-openid.json b/examples/config-openid.json index bd3f7f19..5fb2bee9 100644 --- a/examples/config-openid.json +++ b/examples/config-openid.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot", "dedupe": true diff --git a/examples/config-policy.json b/examples/config-policy.json index 231abbdc..3a8ce061 100644 --- a/examples/config-policy.json +++ b/examples/config-policy.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-popular-registries.json b/examples/config-popular-registries.json index d61cdc6e..27498d76 100644 --- a/examples/config-popular-registries.json +++ b/examples/config-popular-registries.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/data" }, diff --git a/examples/config-ratelimit.json b/examples/config-ratelimit.json index 293a5d43..334573e6 100644 --- a/examples/config-ratelimit.json +++ b/examples/config-ratelimit.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-retention.json b/examples/config-retention.json index 3e46e2bf..a195cc87 100644 --- a/examples/config-retention.json +++ b/examples/config-retention.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot", "gc": true, diff --git a/examples/config-s3.json b/examples/config-s3.json index afabffa6..f9d07e02 100644 --- a/examples/config-s3.json +++ b/examples/config-s3.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot", "dedupe": true, diff --git a/examples/config-scheduler.json b/examples/config-scheduler.json index 3d511a6b..8b1abbd4 100644 --- a/examples/config-scheduler.json +++ b/examples/config-scheduler.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-scrub.json b/examples/config-scrub.json index 967a3990..8d7e7dd6 100644 --- a/examples/config-scrub.json +++ b/examples/config-scrub.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-search.json b/examples/config-search.json index e03ace6c..9cfca691 100644 --- a/examples/config-search.json +++ b/examples/config-search.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-sync-cloud-storage.json b/examples/config-sync-cloud-storage.json index bd4fbbb6..c0cb46cf 100644 --- a/examples/config-sync-cloud-storage.json +++ b/examples/config-sync-cloud-storage.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot", "dedupe": true, diff --git a/examples/config-sync.json b/examples/config-sync.json index c9931197..6c3fe8d2 100644 --- a/examples/config-sync.json +++ b/examples/config-sync.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-test.json b/examples/config-test.json index 5aa8a32c..0e207db7 100644 --- a/examples/config-test.json +++ b/examples/config-test.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-tls.json b/examples/config-tls.json index 1c80ad2e..2d62c864 100644 --- a/examples/config-tls.json +++ b/examples/config-tls.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-ui.json b/examples/config-ui.json index 4dfed6e8..5fd1bec2 100644 --- a/examples/config-ui.json +++ b/examples/config-ui.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.1.0-dev", + "distSpecVersion": "1.1.0", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/go.mod b/go.mod index d1c8eefa..b93cf616 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 344c6dd8..5ef93433 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/pkg/api/routes.go b/pkg/api/routes.go index 7aa5dde0..f9277c92 100644 --- a/pkg/api/routes.go +++ b/pkg/api/routes.go @@ -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 diff --git a/pkg/cli/server/config_reloader_test.go b/pkg/cli/server/config_reloader_test.go index a1f2bc1e..eaf9d0f4 100644 --- a/pkg/cli/server/config_reloader_test.go +++ b/pkg/cli/server/config_reloader_test.go @@ -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" }, diff --git a/pkg/cli/server/extensions_test.go b/pkg/cli/server/extensions_test.go index 6622fddd..5546473f 100644 --- a/pkg/cli/server/extensions_test.go +++ b/pkg/cli/server/extensions_test.go @@ -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":{ diff --git a/pkg/cli/server/root_test.go b/pkg/cli/server/root_test.go index 5a3bacab..ad7e6230 100644 --- a/pkg/cli/server/root_test.go +++ b/pkg/cli/server/root_test.go @@ -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"}}`) diff --git a/pkg/extensions/README_mgmt.md b/pkg/extensions/README_mgmt.md index 4bb6a969..66b460d9 100644 --- a/pkg/extensions/README_mgmt.md +++ b/pkg/extensions/README_mgmt.md @@ -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": { diff --git a/pkg/extensions/sync/sync_test.go b/pkg/extensions/sync/sync_test.go index f4f6f00f..b93dd53a 100644 --- a/pkg/extensions/sync/sync_test.go +++ b/pkg/extensions/sync/sync_test.go @@ -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" }, diff --git a/swagger/docs.go b/swagger/docs.go index ca63da82..7f9a8a90 100644 --- a/swagger/docs.go +++ b/swagger/docs.go @@ -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{}, diff --git a/swagger/swagger.json b/swagger/swagger.json index d20d69d5..451527d2 100644 --- a/swagger/swagger.json +++ b/swagger/swagger.json @@ -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": { diff --git a/swagger/swagger.yaml b/swagger/swagger.yaml index 6cc7add4..49aec135 100644 --- a/swagger/swagger.yaml +++ b/swagger/swagger.yaml @@ -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: diff --git a/test/blackbox/annotations.bats b/test/blackbox/annotations.bats index ff576398..819ad7c6 100644 --- a/test/blackbox/annotations.bats +++ b/test/blackbox/annotations.bats @@ -39,7 +39,7 @@ function setup_file() { echo ${zot_port} > ${BATS_FILE_TMPDIR}/zot.port cat > ${zot_config_file}<> ${zot_htpasswd_file} cat > ${zot_config_file}< ${zot_config_file}< ${BATS_FILE_TMPDIR}/zot.port cat >${zot_config_file} < ${BATS_FILE_TMPDIR}/zot.port cat >${zot_config_file} <> ${zot_htpasswd_file} cat > ${zot_config_file}<> ${zot_htpasswd_file} cat > ${zot_config_file}<${zot_config_file} <${zot_config_file} < ${BATS_FILE_TMPDIR}/zot.port cat > ${zot_config_file}< ${zot_config_file}< ${zot_config_file}< ${BATS_FILE_TMPDIR}/zot.port cat >${ZOT_CONFIG_FILE} < ${zot_config_file_dedupe}< ${zot_config_file_nodedupe}<${ZOT_CONFIG_FILE} <${zot_sync_per_config_file} <${zot_sync_ondemand_config_file} <${zot_minimal_config_file} <${zot_sync_per_config_file} <${zot_sync_ondemand_config_file} <${zot_minimal_config_file} <${zot_sync_ondemand_config_file} <${zot_sync_per_config_file} <${zot_minimal_config_file} <${zot_sync_one_config_file} <${zot_sync_two_config_file} <