diff options
| author | Sebastiaan van Stijn <thaJeztah@users.noreply.github.com> | 2022-05-10 14:27:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-10 14:27:42 +0200 |
| commit | 3228dbaaa90afaa62a897353ba8c9ae305748314 (patch) | |
| tree | ca6deb39c9c39b474b98505a5803e7a8a3fbdc2b /integration-cli | |
| parent | 8149fa55ff3bcb19c9b9246535c69f9657c5b37c (diff) | |
| parent | 070da63310cabb855bc0b34ce0fde229949ff303 (diff) | |
Merge pull request #43555 from thaJeztah/separate_engine_id
daemon: separate daemon ID from trust-key, and disable generating
Diffstat (limited to 'integration-cli')
| -rw-r--r-- | integration-cli/docker_cli_daemon_test.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index 94f07f56b4..96c0d0a906 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -559,6 +559,7 @@ func (s *DockerDaemonSuite) TestDaemonAllocatesListeningPort(c *testing.T) { func (s *DockerDaemonSuite) TestDaemonKeyGeneration(c *testing.T) { // TODO: skip or update for Windows daemon os.Remove("/etc/docker/key.json") + c.Setenv("DOCKER_ALLOW_SCHEMA1_PUSH_DONOTUSE", "1") s.d.Start(c) s.d.Stop(c) @@ -1212,6 +1213,7 @@ func (s *DockerDaemonSuite) TestDaemonWithWrongkey(c *testing.T) { } os.Remove("/etc/docker/key.json") + c.Setenv("DOCKER_ALLOW_SCHEMA1_PUSH_DONOTUSE", "1") s.d.Start(c) s.d.Stop(c) |