summaryrefslogtreecommitdiff
path: root/.copr
diff options
context:
space:
mode:
authorPeter Hunt <pehunt@redhat.com>2019-05-17 12:48:11 -0400
committerPeter Hunt <pehunt@redhat.com>2019-05-17 12:54:47 -0400
commitcb0d89c56e5a6515a2f79e041a0f7e3937ab087d (patch)
tree3654b9a019804635c448312d953ab578cc04b7b0 /.copr
parent38333970ba23338b1477f26e1807d21c74da8654 (diff)
downloadpodman-cb0d89c56e5a6515a2f79e041a0f7e3937ab087d.tar.gz
podman-cb0d89c56e5a6515a2f79e041a0f7e3937ab087d.tar.bz2
podman-cb0d89c56e5a6515a2f79e041a0f7e3937ab087d.zip
Use containers/conmon
There were some build issues updating cri-o to cri-o/cri-o. Since the only thing we need cri-o for is conmon, we should just build using conmon. Signed-off-by: Peter Hunt <pehunt@redhat.com>
Diffstat (limited to '.copr')
-rw-r--r--.copr/Makefile2
-rw-r--r--.copr/prepare.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/.copr/Makefile b/.copr/Makefile
index 05d9eb592..71142920b 100644
--- a/.copr/Makefile
+++ b/.copr/Makefile
@@ -16,4 +16,4 @@ build_binary:
clean:
rm -fr rpms
- rm -fr cri-o
+ rm -fr conmon
diff --git a/.copr/prepare.sh b/.copr/prepare.sh
index 1ad29da36..a40e2aadb 100644
--- a/.copr/prepare.sh
+++ b/.copr/prepare.sh
@@ -28,5 +28,5 @@ fi
mkdir build/
git archive --prefix "libpod-${COMMIT_SHORT}/" --format "tar.gz" HEAD -o "build/libpod-${COMMIT_SHORT}.tar.gz"
-git clone https://github.com/kubernetes-incubator/cri-o
-cd cri-o && git checkout 4cd5a7c60349be0678d9f1b0657683324c1a2726 && git archive --prefix "crio/" --format "tar.gz" HEAD -o "../build/crio.tar.gz"
+git clone https://github.com/containers/conmon
+cd conmon && git checkout f02c053eb37010fc76d1e2966de7f2cb9f969ef2 && git archive --prefix "conmon/" --format "tar.gz" HEAD -o "../build/conmon.tar.gz"