From 0784aa5e49a0446b61bd88cff15f1fca0f9d4576 Mon Sep 17 00:00:00 2001 From: Jan Nidzwetzki Date: Wed, 25 Dec 2019 10:40:35 +0100 Subject: [PATCH 1/5] Fixed wrong filename in documentation --- docs/credential-helpers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/credential-helpers.md b/docs/credential-helpers.md index 1722906..165a9cd 100644 --- a/docs/credential-helpers.md +++ b/docs/credential-helpers.md @@ -45,7 +45,7 @@ volumes: helper: {} ``` -and for `.docker/config.yml`: +and for `.docker/config.json`: ```yaml { "HttpHeaders" : { @@ -61,4 +61,4 @@ and for `.docker/config.yml`: "index.docker.io": "osxkeychain" // ...or your prefered helper } } -``` \ No newline at end of file +``` From 3b8305985fda16e03d580df8539cbb4b9b91cf96 Mon Sep 17 00:00:00 2001 From: Jan Nidzwetzki Date: Wed, 25 Dec 2019 10:47:57 +0100 Subject: [PATCH 2/5] Added full path to config file --- docs/credential-helpers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/credential-helpers.md b/docs/credential-helpers.md index 165a9cd..d1869e1 100644 --- a/docs/credential-helpers.md +++ b/docs/credential-helpers.md @@ -45,7 +45,7 @@ volumes: helper: {} ``` -and for `.docker/config.json`: +and for `/.docker/config.json`: ```yaml { "HttpHeaders" : { From 35be6ce37f1458facbe59ca78e602cfa4865b159 Mon Sep 17 00:00:00 2001 From: Jan Nidzwetzki Date: Wed, 25 Dec 2019 13:29:38 +0100 Subject: [PATCH 3/5] Changed codeblock language --- docs/credential-helpers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/credential-helpers.md b/docs/credential-helpers.md index d1869e1..719d11e 100644 --- a/docs/credential-helpers.md +++ b/docs/credential-helpers.md @@ -46,7 +46,7 @@ volumes: ``` and for `/.docker/config.json`: -```yaml +```json { "HttpHeaders" : { "User-Agent" : "Docker-Client/19.03.1 (XXXXXX)" From f28093e0eabcc09de3baf909547e5004343a2700 Mon Sep 17 00:00:00 2001 From: Jan Kristof Nidzwetzki Date: Wed, 25 Dec 2019 13:32:39 +0100 Subject: [PATCH 4/5] Update credential-helpers.md --- docs/credential-helpers.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/credential-helpers.md b/docs/credential-helpers.md index 719d11e..cca9e92 100644 --- a/docs/credential-helpers.md +++ b/docs/credential-helpers.md @@ -51,14 +51,16 @@ and for `/.docker/config.json`: "HttpHeaders" : { "User-Agent" : "Docker-Client/19.03.1 (XXXXXX)" }, - "credsStore" : "osxkeychain", // ...or your prefered helper + "credsStore" : "osxkeychain", "auths" : { "xyzxyzxyz.dkr.ecr.eu-north-1.amazonaws.com" : {}, "https://index.docker.io/v1/": {} }, "credHelpers": { "xyzxyzxyz.dkr.ecr.eu-north-1.amazonaws.com" : "ecr-login", - "index.docker.io": "osxkeychain" // ...or your prefered helper + "index.docker.io": "osxkeychain" } } ``` + +*Note:* `osxkeychain` can be changed to your prefered credentials helper From 893fd035dd3ae479c5006b1babcbc0926d3b70fd Mon Sep 17 00:00:00 2001 From: Jan Nidzwetzki Date: Wed, 25 Dec 2019 13:37:48 +0100 Subject: [PATCH 5/5] Fixed small typo --- docs/credential-helpers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/credential-helpers.md b/docs/credential-helpers.md index cca9e92..c86ef7c 100644 --- a/docs/credential-helpers.md +++ b/docs/credential-helpers.md @@ -63,4 +63,4 @@ and for `/.docker/config.json`: } ``` -*Note:* `osxkeychain` can be changed to your prefered credentials helper +*Note:* `osxkeychain` can be changed to your prefered credentials helper.