8000 Keep but deprecate registry v2 schema1 logic and revert to libtrust-key-based engine ID by tiborvass · Pull Request #39365 · moby/moby · GitHub
[go: up one dir, main page]
Skip to content

Keep but deprecate registry v2 schema1 logic and revert to libtrust-key-based engine ID #39365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 18, 2019
Merged

Keep but deprecate registry v2 schema1 logic and revert to libtrust-key-based engine ID #39365

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f23a51a
Revert "Remove Schema1 integration test suite"
Jun 17, 2019
0811297
use gotest.tools assertions in docker_cli_push_test.go
8000 Jun 15, 2019
f695e98
Revert "Remove the rest of v1 manifest support"
Jun 18, 2019
53dad9f
Remove v1 manifest code
Jun 18, 2019
f923321
Add test for keeping same daemon ID on upgrade
Jun 15, 2019
d35f8f4
Add deprecation message for schema1
Jun 15, 2019
3f1cdd5
validate: temporarily disable deprecate-integration-cli as part of a …
Jun 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test for keeping same daemon ID on upgrade 
Signed-off-by: Tibor Vass <tibor@docker.com>
  • Loading branch information
Tibor Vass committed Jun 18, 2019
commit f923321aae7a961e94c00207cc80e51d410c676d
2 changes: 2 additions & 0 deletions daemon/config/config.go
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ var flatOptions = map[string]bool{
var skipValidateOptions = map[string]bool{
"features": true,
"builder": true,
// Corresponding flag has been removed because it was already unusable
"deprecated-key-path": true,
}

// skipDuplicates contains configuration keys that
Expand Down
23 changes: 23 additions & 0 deletions integration/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"bytes"
"context"
"encoding/json"
"io/ioutil"
"path/filepath"
"sort"
"testing"
"time"
Expand All @@ -13,6 +15,7 @@ import (
swarmtypes "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/client"
"github.com/docker/docker/integration/internal/swarm"
"github.com/docker/docker/internal/test/daemon"
"github.com/docker/docker/pkg/stdcopy"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
Expand Down Expand Up @@ -417,6 +420,26 @@ func TestConfigCreateResolve(t *testing.T) {
assert.Assert(t, is.Equal(0, len(entries)))
}

func TestConfigDaemonLibtrustID(t *testing.T) {
skip.If(t, testEnv.DaemonInfo.OSType != "linux")
defer setupTest(t)()

d := daemon.New(t)
defer d.Stop(t)

trustKey := filepath.Join(d.RootDir(), "key.json")
err := ioutil.WriteFile(trustKey, []byte(`{"crv":"P-256","d":"dm28PH4Z4EbyUN8L0bPonAciAQa1QJmmyYd876mnypY","kid":"WTJ3:YSIP:CE2E:G6KJ:PSBD:YX2Y:WEYD:M64G:NU2V:XPZV:H2CR:VLUB","kty":"EC","x":"Mh5-JINSjaa_EZdXDttri255Z5fbCEOTQIZjAcScFTk","y":"eUyuAjfxevb07hCCpvi4Zi334Dy4GDWQvEToGEX4exQ"}`), 0644)
assert.NilError(t, err)

config := filepath.Join(d.RootDir(), "daemon.json")
err = ioutil.WriteFile(config, []byte(`{"deprecated-key-path": "`+trustKey+`"}`), 0644)
assert.NilError(t, err)

d.Start(t, "--config-file", config)
info := d.Info(t)
assert.Equal(t, info.ID, "WTJ3:YSIP:CE2E:G6KJ:PSBD:YX2Y:WEYD:M64G:NU2V:XPZV:H2CR:VLUB")
}

func configNamesFromList(entries []swarmtypes.Config) []string {
var values []string
for _, entry := range entries {
Expand Down
0