summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-06-24 09:47:24 -0400
committerAshley Cui <acui@redhat.com>2020-08-04 16:52:22 -0400
commitabd5ebdde3c24a5c1f173a191b01140b5e7c8a71 (patch)
tree82a86176c68bab0c44734c15d30ee55d19d603bb
parent0d81149554df0b27bd8976ffe9910fe39da6f1ef (diff)
downloadpodman-abd5ebdde3c24a5c1f173a191b01140b5e7c8a71.tar.gz
podman-abd5ebdde3c24a5c1f173a191b01140b5e7c8a71.tar.bz2
podman-abd5ebdde3c24a5c1f173a191b01140b5e7c8a71.zip
Add containers.conf default file for windows and MAC Installs
We want to add this configuration file so that users can descover how to configure the permanent connection to a remote podman instance. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
-rw-r--r--Makefile1
-rw-r--r--contrib/remote/containers.conf11
2 files changed, 12 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index bfb34f3ab..104c50c4c 100644
--- a/Makefile
+++ b/Makefile
@@ -479,6 +479,7 @@ podman-remote-release-%.zip:
cp release.txt "$(TMPDIR)/"
cp ./bin/podman-remote-$*$(BINSFX) "$(TMPDIR)/$(SUBDIR)/podman$(BINSFX)"
cp -r ./docs/build/remote/$* "$(TMPDIR)/$(SUBDIR)/docs/"
+ cp ./contrib/remote/containers.conf "$(TMPDIR)/$(SUBDIR)/"
cd "$(TMPDIR)/$(SUBDIR)" && \
zip --recurse-paths "$(CURDIR)/$@" "./release.txt" "./"
-rm -rf "$(TMPDIR)"
diff --git a/contrib/remote/containers.conf b/contrib/remote/containers.conf
new file mode 100644
index 000000000..45f58171a
--- /dev/null
+++ b/contrib/remote/containers.conf
@@ -0,0 +1,11 @@
+# The containers configuration file specifies all of the available configuration
+# command-line options/flags for container engine tools like Podman
+# but in a TOML format that can be easily modified and versioned.
+
+[engine]
+
+# Default Remote URI to access the Podman service.
+# Examples:
+# remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
+# remote rootfull ssh://root@10.10.1.136:22/run/podman/podman.sock
+# remote_uri= ""