From e1242ed726b590367e37a73585d73d45f5bf13c6 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Sat, 7 May 2016 09:26:34 -0700 Subject: [PATCH] Remove deprecated Docker Content Trust ENV passphrase variables Since 1.9, Docker Content Trust Offline key has been renamed to Root key and the Tagging key has been renamed to Repository key. The corresponding environment variables `DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE` `DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE` have also been deprecated and renamed to `DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE` `DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE` This fix removed the deprecated ENV passphrase variables for 1.12 and updated the docs. Signed-off-by: Yong Tang --- docs/deprecated.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/deprecated.md b/docs/deprecated.md index 58668d25d8..6b438487d8 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -145,9 +145,9 @@ Version 1.9 adds a flag (`--disable-legacy-registry=false`) which prevents the d ### Docker Content Trust ENV passphrase variables name change **Deprecated In Release: v1.9** -**Target For Removal In Release: v1.10** +**Removed In Release: v1.12** -As of 1.9, Docker Content Trust Offline key will be renamed to Root key and the Tagging key will be renamed to Repository key. Due to this renaming, we're also changing the corresponding environment variables +Since 1.9, Docker Content Trust Offline key has been renamed to Root key and the Tagging key has been renamed to Repository key. Due to this renaming, we're also changing the corresponding environment variables -- DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE will now be named DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE -- DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE will now be named DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE +- DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE is named DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE +- DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE is named DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE