summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorQi Wang <qiwan@redhat.com>2018-10-09 09:26:47 -0400
committerQi Wang <qiwan@redhat.com>2018-10-12 10:05:14 -0400
commit88673a5fcfcedb3ab3f1039a46b3eba912f35e5c (patch)
tree59b86e95fccb21f26591177747adfcffa6816f85 /docs
parentda5c89497f9d6ee5cb6e826d7db7cca5686ab4f7 (diff)
downloadpodman-88673a5fcfcedb3ab3f1039a46b3eba912f35e5c.tar.gz
podman-88673a5fcfcedb3ab3f1039a46b3eba912f35e5c.tar.bz2
podman-88673a5fcfcedb3ab3f1039a46b3eba912f35e5c.zip
Support auth file environment variable & add change to man pages
Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/podman-build.1.md3
-rw-r--r--docs/podman-container-runlabel.1.md3
-rw-r--r--docs/podman-login.1.md3
-rw-r--r--docs/podman-logout.1.md3
-rw-r--r--docs/podman-pull.1.md3
-rw-r--r--docs/podman-push.1.md3
-rw-r--r--docs/podman-search.1.md3
7 files changed, 21 insertions, 0 deletions
diff --git a/docs/podman-build.1.md b/docs/podman-build.1.md
index a6a8dfbc2..0cbce15c0 100644
--- a/docs/podman-build.1.md
+++ b/docs/podman-build.1.md
@@ -38,6 +38,9 @@ Note: this information is not present in Docker image formats, so it is discarde
Path of the authentication file. Default is ${XDG\_RUNTIME\_DIR}/containers/auth.json, which is set using `podman login`.
If the authorization state is not found there, $HOME/.docker/config.json is checked, which is set using `docker login`.
+Note: You can also override the default path of the authentication file by setting the REGISTRY\_AUTH\_FILE
+environment variable. `export REGISTRY_AUTH_FILE=path`
+
**--build-arg** *arg=value*
Specifies a build argument and its value, which will be interpolated in
diff --git a/docs/podman-container-runlabel.1.md b/docs/podman-container-runlabel.1.md
index 4611aa4d9..73b7d7e15 100644
--- a/docs/podman-container-runlabel.1.md
+++ b/docs/podman-container-runlabel.1.md
@@ -54,6 +54,9 @@ Any additional arguments will be appended to the command.
Path of the authentication file. Default is ${XDG_RUNTIME\_DIR}/containers/auth.json, which is set using `podman login`.
If the authorization state is not found there, $HOME/.docker/config.json is checked, which is set using `docker login`.
+Note: You can also override the default path of the authentication file by setting the REGISTRY\_AUTH\_FILE
+environment variable. `export REGISTRY_AUTH_FILE=path`
+
**--display**
Display the label's value of the image having populated its environment variables.
diff --git a/docs/podman-login.1.md b/docs/podman-login.1.md
index a0b9a2fe6..a3ee2929c 100644
--- a/docs/podman-login.1.md
+++ b/docs/podman-login.1.md
@@ -33,6 +33,9 @@ Username for registry
Path of the authentication file. Default is ${XDG_\RUNTIME\_DIR}/containers/auth.json
+Note: You can also override the default path of the authentication file by setting the REGISTRY\_AUTH\_FILE
+environment variable. `export REGISTRY_AUTH_FILE=path`
+
**--cert-dir** *path*
Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry.
diff --git a/docs/podman-logout.1.md b/docs/podman-logout.1.md
index 4e001085c..be0c52e39 100644
--- a/docs/podman-logout.1.md
+++ b/docs/podman-logout.1.md
@@ -24,6 +24,9 @@ All the cached credentials can be removed by setting the **all** flag.
Path of the authentication file. Default is ${XDG_\RUNTIME\_DIR}/containers/auth.json
+Note: You can also override the default path of the authentication file by setting the REGISTRY\_AUTH\_FILE
+environment variable. `export REGISTRY_AUTH_FILE=path`
+
**--all, -a**
Remove the cached credentials for all registries in the auth file
diff --git a/docs/podman-pull.1.md b/docs/podman-pull.1.md
index 6eff52cea..86c6823af 100644
--- a/docs/podman-pull.1.md
+++ b/docs/podman-pull.1.md
@@ -50,6 +50,9 @@ Image stored in local container/storage
Path of the authentication file. Default is ${XDG_RUNTIME\_DIR}/containers/auth.json, which is set using `podman login`.
If the authorization state is not found there, $HOME/.docker/config.json is checked, which is set using `docker login`.
+Note: You can also override the default path of the authentication file by setting the REGISTRY\_AUTH\_FILE
+environment variable. `export REGISTRY_AUTH_FILE=path`
+
**--cert-dir** *path*
Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry.
diff --git a/docs/podman-push.1.md b/docs/podman-push.1.md
index 40442a98f..537988ea0 100644
--- a/docs/podman-push.1.md
+++ b/docs/podman-push.1.md
@@ -49,6 +49,9 @@ Image stored in local container/storage
Path of the authentication file. Default is ${XDG_RUNTIME\_DIR}/containers/auth.json, which is set using `podman login`.
If the authorization state is not found there, $HOME/.docker/config.json is checked, which is set using `docker login`.
+Note: You can also override the default path of the authentication file by setting the REGISTRY\_AUTH\_FILE
+environment variable. `export REGISTRY_AUTH_FILE=path`
+
**--creds="CREDENTIALS"**
The [username[:password]] to use to authenticate with the registry if required.
diff --git a/docs/podman-search.1.md b/docs/podman-search.1.md
index 429c3c5ad..ea1228f94 100644
--- a/docs/podman-search.1.md
+++ b/docs/podman-search.1.md
@@ -29,6 +29,9 @@ Note, searching without a search term will only work for registries that impleme
Path of the authentication file. Default is ${XDG_\RUNTIME\_DIR}/containers/auth.json
+Note: You can also override the default path of the authentication file by setting the REGISTRY\_AUTH\_FILE
+environment variable. `export REGISTRY_AUTH_FILE=path`
+
**--filter, -f**
Filter output based on conditions provided (default [])