summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-25 13:19:52 -0400
committerGitHub <noreply@github.com>2020-06-25 13:19:52 -0400
commit12761ede68d1fd55c0da6d5651c5ee8cf33f421b (patch)
treed2ae5e741fec9b3f0f1d1a8691dda7d1d7ee6e8f /Makefile
parent05e1df2693cbc7787f196eadd70fbca1da195058 (diff)
parenta10da9a99961a2701e521b0bc22cfa7638e695b4 (diff)
downloadpodman-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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 55b42c431..5c813dac5 100644
--- a/Makefile
+++ b/Makefile
@@ -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)"