diff --git a/examples/config-all-remote.json b/examples/config-all-remote.json index 373f3032..a6bca614 100644 --- a/examples/config-all-remote.json +++ b/examples/config-all-remote.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "dedupe": true, "remoteCache": true, diff --git a/examples/config-allextensions.json b/examples/config-allextensions.json index 1f9bd491..5ee0ec3d 100644 --- a/examples/config-allextensions.json +++ b/examples/config-allextensions.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-anonymous-authz.json b/examples/config-anonymous-authz.json index f530e3cd..22d2075d 100644 --- a/examples/config-anonymous-authz.json +++ b/examples/config-anonymous-authz.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-bearer-auth.json b/examples/config-bearer-auth.json index 513e4f9e..3517137b 100644 --- a/examples/config-bearer-auth.json +++ b/examples/config-bearer-auth.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-bench.json b/examples/config-bench.json index 9cde9e58..a0627f81 100644 --- a/examples/config-bench.json +++ b/examples/config-bench.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-boltdb.json b/examples/config-boltdb.json index 3610d001..3f274edd 100644 --- a/examples/config-boltdb.json +++ b/examples/config-boltdb.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot", "dedupe": true, diff --git a/examples/config-commit.json b/examples/config-commit.json index 1e985e7b..9a79853e 100644 --- a/examples/config-commit.json +++ b/examples/config-commit.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot", "commit": true diff --git a/examples/config-conformance.json b/examples/config-conformance.json index 6dc1641a..175aa9c2 100644 --- a/examples/config-conformance.json +++ b/examples/config-conformance.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot", "gc": false, diff --git a/examples/config-cve.json b/examples/config-cve.json index 2c3a5cc5..d08ae3cd 100644 --- a/examples/config-cve.json +++ b/examples/config-cve.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-dynamodb.json b/examples/config-dynamodb.json index ac884381..1134727a 100644 --- a/examples/config-dynamodb.json +++ b/examples/config-dynamodb.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot", "dedupe": true, diff --git a/examples/config-example.json b/examples/config-example.json index 43f502b6..cf744d89 100644 --- a/examples/config-example.json +++ b/examples/config-example.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-example.yaml b/examples/config-example.yaml index d33fc682..a627ad96 100644 --- a/examples/config-example.yaml +++ b/examples/config-example.yaml @@ -1,4 +1,4 @@ -distspecversion: 1.0.1-dev +distspecversion: 1.1.0-dev http: address: 127.0.0.1 auth: diff --git a/examples/config-gc-periodic.json b/examples/config-gc-periodic.json index f4cf4da6..88e38cff 100644 --- a/examples/config-gc-periodic.json +++ b/examples/config-gc-periodic.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot", "gc": true, diff --git a/examples/config-gc.json b/examples/config-gc.json index 6033f2d3..c4923946 100644 --- a/examples/config-gc.json +++ b/examples/config-gc.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot", "gc": true, diff --git a/examples/config-lint.json b/examples/config-lint.json index 40f7aa42..065aefa8 100644 --- a/examples/config-lint.json +++ b/examples/config-lint.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-metrics.json b/examples/config-metrics.json index 3c558973..7ec5845c 100644 --- a/examples/config-metrics.json +++ b/examples/config-metrics.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-minimal.json b/examples/config-minimal.json index 206e3c04..49f519f5 100644 --- a/examples/config-minimal.json +++ b/examples/config-minimal.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-multiple-cve.json b/examples/config-multiple-cve.json index cc2699c0..6f087946 100644 --- a/examples/config-multiple-cve.json +++ b/examples/config-multiple-cve.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot", "dedupe": true, diff --git a/examples/config-multiple.json b/examples/config-multiple.json index be1dbee9..c1463767 100644 --- a/examples/config-multiple.json +++ b/examples/config-multiple.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot", "dedupe": true, diff --git a/examples/config-policy.json b/examples/config-policy.json index 8683ec08..b658b544 100644 --- a/examples/config-policy.json +++ b/examples/config-policy.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-ratelimit.json b/examples/config-ratelimit.json index 27ced07a..293a5d43 100644 --- a/examples/config-ratelimit.json +++ b/examples/config-ratelimit.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-s3.json b/examples/config-s3.json index 8929ef23..afabffa6 100644 --- a/examples/config-s3.json +++ b/examples/config-s3.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot", "dedupe": true, diff --git a/examples/config-scrub.json b/examples/config-scrub.json index 878cff79..967a3990 100644 --- a/examples/config-scrub.json +++ b/examples/config-scrub.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-search.json b/examples/config-search.json index 8efd6f5e..e03ace6c 100644 --- a/examples/config-search.json +++ b/examples/config-search.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-sync-localhost.json b/examples/config-sync-localhost.json index 86d2bbac..fc545f7b 100644 --- a/examples/config-sync-localhost.json +++ b/examples/config-sync-localhost.json @@ -1,5 +1,5 @@ { - "distspecversion":"1.0.1-dev", + "distspecversion":"1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot_to_sync", "dedupe": false, diff --git a/examples/config-sync.json b/examples/config-sync.json index ae8a18c1..de1714ce 100644 --- a/examples/config-sync.json +++ b/examples/config-sync.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-test.json b/examples/config-test.json index ab2dd4ec..5aa8a32c 100644 --- a/examples/config-test.json +++ b/examples/config-test.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/config-tls.json b/examples/config-tls.json index 901a166b..703c1a3f 100644 --- a/examples/config-tls.json +++ b/examples/config-tls.json @@ -1,5 +1,5 @@ { - "distSpecVersion": "1.0.1-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/examples/metrics/old-config.json b/examples/metrics/old-config.json new file mode 100644 index 00000000..67c45d09 --- /dev/null +++ b/examples/metrics/old-config.json @@ -0,0 +1,40 @@ +{ + "configs": [ + { + "_name": "zot5000", + "showspinner": true, + "url": "https://aci-zot.cisco.com:5000", + "verify-tls": true + }, + { + "_name": "zot5050", + "showspinner": true, + "url": "https://aci-zot.cisco.com:5050", + "verify-tls": true + }, + { + "_name": "cdockerhub", + "showspinner": true, + "url": "https://dockerhub.cisco.com:5000/", + "verify-tls": true + }, + { + "_name": "local", + "showspinner": false, + "url": "http://127.0.0.1:8080/", + "verify-tls": false + }, + { + "_name": "zothub", + "showspinner": true, + "url": "https://zothub.io/", + "verify-tls": true + }, + { + "_name": "local2", + "showspinner": true, + "url": "http://172.31.132.115:5000", + "verify-tls": true + } + ] + } \ No newline at end of file diff --git a/go.mod b/go.mod index e807a2cf..8bc8c2a7 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,7 @@ require ( github.com/containers/image/v5 v5.23.0 github.com/gobwas/glob v0.2.3 github.com/notaryproject/notation-go v0.12.0-beta.1 - github.com/opencontainers/distribution-spec/specs-go v0.0.0-20220620172159-4ab4752c3b86 + github.com/opencontainers/distribution-spec/specs-go v0.0.0-20230117141039-067a0f5b0e25 github.com/sigstore/cosign v1.13.1 github.com/swaggo/http-swagger v1.3.3 ) diff --git a/go.sum b/go.sum index 18e90949..20d9eec9 100644 --- a/go.sum +++ b/go.sum @@ -1675,8 +1675,8 @@ github.com/onsi/gomega v1.20.2 h1:8uQq0zMgLEfa0vRrrBgaJF2gyW9Da9BmfGV+OyUzfkY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/open-policy-agent/opa v0.45.0 h1:P5nuhVRtR+e58fk3CMMbiqr6ZFyWQPNOC3otsorGsFs= github.com/open-policy-agent/opa v0.45.0/go.mod h1:/OnsYljNEWJ6DXeFOOnoGn8CvwZGMUS4iRqzYdJvmBI= -github.com/opencontainers/distribution-spec/specs-go v0.0.0-20220620172159-4ab4752c3b86 h1:Oumw+lPnO8qNLTY2mrqPJZMoGExLi/0h/DdikoLTXVU= -github.com/opencontainers/distribution-spec/specs-go v0.0.0-20220620172159-4ab4752c3b86/go.mod h1:aA4vdXRS8E1TG7pLZOz85InHi3BiPdErh8IpJN6E0x4= +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/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/pkg/api/routes.go b/pkg/api/routes.go index e081cab3..81e763e1 100644 --- a/pkg/api/routes.go +++ b/pkg/api/routes.go @@ -1,5 +1,5 @@ // @title Open Container Initiative Distribution Specification -// @version v0.1.0-dev +// @version v1.1.0-dev // @description APIs for Open Container Initiative Distribution Specification // @license.name Apache 2.0 diff --git a/pkg/cli/config_reloader_test.go b/pkg/cli/config_reloader_test.go index 27e3ccc4..3dd10bf2 100644 --- a/pkg/cli/config_reloader_test.go +++ b/pkg/cli/config_reloader_test.go @@ -42,7 +42,7 @@ func TestConfigReloader(t *testing.T) { defer os.Remove(logFile.Name()) // clean up content := fmt.Sprintf(`{ - "distSpecVersion": "0.1.0-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, @@ -98,7 +98,7 @@ func TestConfigReloader(t *testing.T) { test.WaitTillServerReady(baseURL) content = fmt.Sprintf(`{ - "distSpecVersion": "0.1.0-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, @@ -167,7 +167,7 @@ func TestConfigReloader(t *testing.T) { defer os.Remove(logFile.Name()) // clean up content := fmt.Sprintf(`{ - "distSpecVersion": "0.1.0-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, @@ -222,7 +222,7 @@ func TestConfigReloader(t *testing.T) { test.WaitTillServerReady(baseURL) content = fmt.Sprintf(`{ - "distSpecVersion": "0.1.0-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, @@ -297,7 +297,7 @@ func TestConfigReloader(t *testing.T) { defer os.Remove(logFile.Name()) // clean up content := fmt.Sprintf(`{ - "distSpecVersion": "0.1.0-dev", + "distSpecVersion": "1.1.0-dev", "storage": { "rootDirectory": "/tmp/zot" }, diff --git a/pkg/extensions/sync/sync_test.go b/pkg/extensions/sync/sync_test.go index f09bb278..08820072 100644 --- a/pkg/extensions/sync/sync_test.go +++ b/pkg/extensions/sync/sync_test.go @@ -767,7 +767,7 @@ func TestConfigReloader(t *testing.T) { defer dcm.StopServer() - content := fmt.Sprintf(`{"distSpecVersion": "0.1.0-dev", "storage": {"rootDirectory": "%s"}, + content := fmt.Sprintf(`{"distSpecVersion": "1.1.0-dev", "storage": {"rootDirectory": "%s"}, "http": {"address": "127.0.0.1", "port": "%s"}, "log": {"level": "debug", "output": "%s"}}`, destDir, destPort, logFile.Name()) diff --git a/swagger/docs.go b/swagger/docs.go index 84559d2d..ebafcf36 100644 --- a/swagger/docs.go +++ b/swagger/docs.go @@ -824,7 +824,7 @@ type swaggerInfo struct { // SwaggerInfo holds exported Swagger Info so clients can modify it var SwaggerInfo = swaggerInfo{ - Version: "v0.1.0-dev", + Version: "v1.1.0-dev", Host: "", BasePath: "", Schemes: []string{}, diff --git a/swagger/swagger.json b/swagger/swagger.json index d2230e80..6edb37ba 100644 --- a/swagger/swagger.json +++ b/swagger/swagger.json @@ -12,7 +12,7 @@ "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "v0.1.0-dev" + "version": "v1.1.0-dev" }, "paths": { "/oras/artifacts/v1/{name": { diff --git a/swagger/swagger.yaml b/swagger/swagger.yaml index e0385d27..e0993502 100644 --- a/swagger/swagger.yaml +++ b/swagger/swagger.yaml @@ -29,7 +29,7 @@ info: name: Apache 2.0 url: http://www.apache.org/licenses/LICENSE-2.0.html title: Open Container Initiative Distribution Specification - version: v0.1.0-dev + version: v1.1.0-dev paths: /oras/artifacts/v1/{name: get: diff --git a/test/blackbox/annotations.bats b/test/blackbox/annotations.bats index 609988f8..d5dad2b5 100644 --- a/test/blackbox/annotations.bats +++ b/test/blackbox/annotations.bats @@ -15,7 +15,7 @@ function setup_file() { mkdir -p ${oci_data_dir} cat > ${zot_config_file}<> ${htpasswordFile} cat > ${zot_config_file}< ${zot_config_file}<${zot_config_file} <> ${htpasswordFile} cat > ${zot_config_file}<${zot_config_file} < ${zot_config_file}<${ZOT_CONFIG_FILE} <${zot_sync_per_config_file} <${zot_sync_ondemand_config_file} <${zot_minimal_config_file} <${zot_sync_ondemand_config_file} <