Browse code

Update help for docker/config.json secrets

Jordan Liggitt authored on 2016/01/30 01:38:26
Showing 2 changed files
... ...
@@ -900,13 +900,16 @@ Create a new dockercfg secret
900 900
 
901 901
 [options="nowrap"]
902 902
 ----
903
-  // If you don't already have a .dockercfg file, you can create a dockercfg secret directly by using:
903
+  # Create a new .dockercfg secret:
904 904
   $ oc secrets new-dockercfg SECRET --docker-server=DOCKER_REGISTRY_SERVER --docker-username=DOCKER_USER --docker-password=DOCKER_PASSWORD --docker-email=DOCKER_EMAIL
905 905
 
906
-  // If you do already have a .dockercfg file, you can create a dockercfg secret by using:
906
+  # Create a new .dockercfg secret from an existing file:
907 907
   $ oc secrets new SECRET path/to/.dockercfg
908 908
 
909
-  // To add new secret to 'imagePullSecrets' for the node, or 'secrets' for builds, use:
909
+  # Create a new .docker/config.json secret from an existing file:
910
+  $ oc secrets new SECRET .dockerconfigjson=path/to/.docker/config.json
911
+
912
+  # To add new secret to 'imagePullSecrets' for the node, or 'secrets' for builds, use:
910 913
   $ oc edit SERVICE_ACCOUNT
911 914
 ----
912 915
 ====
... ...
@@ -33,13 +33,16 @@ When creating applications, you may have a Docker registry that requires authent
33 33
 nodes to pull images on your behalf, they have to have the credentials.  You can provide this information
34 34
 by creating a dockercfg secret and attaching it to your service account.`
35 35
 
36
-	createDockercfgExample = `  // If you don't already have a .dockercfg file, you can create a dockercfg secret directly by using:
36
+	createDockercfgExample = `  # Create a new .dockercfg secret:
37 37
   $ %[1]s SECRET --docker-server=DOCKER_REGISTRY_SERVER --docker-username=DOCKER_USER --docker-password=DOCKER_PASSWORD --docker-email=DOCKER_EMAIL
38 38
 
39
-  // If you do already have a .dockercfg file, you can create a dockercfg secret by using:
39
+  # Create a new .dockercfg secret from an existing file:
40 40
   $ %[2]s SECRET path/to/.dockercfg
41 41
 
42
-  // To add new secret to 'imagePullSecrets' for the node, or 'secrets' for builds, use:
42
+  # Create a new .docker/config.json secret from an existing file:
43
+  $ %[2]s SECRET .dockerconfigjson=path/to/.docker/config.json
44
+
45
+  # To add new secret to 'imagePullSecrets' for the node, or 'secrets' for builds, use:
43 46
   $ %[3]s SERVICE_ACCOUNT`
44 47
 )
45 48