use ad-hoc libtrust key

This is only used for tests, and the key is not verified anymore, so
instead of creating a key and storing it, we can just use an ad-hoc
one.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

1 files changed, 0 insertions, 13 deletions

diff --git a/daemon/daemon.go b/daemon/daemon.go
index eb2377eea5..6c7d024595 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -1058,19 +1058,6 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
 			ContentNamespace:          config.ContainerdNamespace,
 		}
 
-		// This is a temporary environment variables used in CI to allow pushing
-		// manifest v2 schema 1 images to test-registries used for testing *pulling*
-		// these images.
-		if os.Getenv("DOCKER_ALLOW_SCHEMA1_PUSH_DONOTUSE") != "" {
-			// Previously, this was stored in the daemon's config-directory, but
-			// as pushing V1 is deprecated, and we only need this file during
-			// our integration tests, just store it within the "trust" directory.
-			imgSvcConfig.TrustKey, err = loadOrCreateTrustKey(filepath.Join(config.Root, "trust", "key.json"))
-			if err != nil {
-				return nil, err
-			}
-		}
-
 		// containerd is not currently supported with Windows.
 		// So sometimes d.containerdCli will be nil
 		// In that case we'll create a local content store... but otherwise we'll use containerd