diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-25 13:19:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 13:19:52 -0400 |
| commit | 12761ede68d1fd55c0da6d5651c5ee8cf33f421b (patch) | |
| tree | d2ae5e741fec9b3f0f1d1a8691dda7d1d7ee6e8f | |
| parent | 05e1df2693cbc7787f196eadd70fbca1da195058 (diff) | |
| parent | a10da9a99961a2701e521b0bc22cfa7638e695b4 (diff) | |
| download | podman-12761ede68d1fd55c0da6d5651c5ee8cf33f421b.tar.gz podman-12761ede68d1fd55c0da6d5651c5ee8cf33f421b.tar.bz2 podman-12761ede68d1fd55c0da6d5651c5ee8cf33f421b.zip | |
Merge pull request #6748 from rhatdan/windows
Add containers.conf default file for windows and MAC Installs
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | contrib/remote/containers.conf | 11 |
2 files changed, 12 insertions, 0 deletions
@@ -478,6 +478,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= "" |