diff options
| author | Peter Hunt <pehunt@redhat.com> | 2019-05-17 12:48:11 -0400 |
|---|---|---|
| committer | Peter Hunt <pehunt@redhat.com> | 2019-05-17 12:54:47 -0400 |
| commit | cb0d89c56e5a6515a2f79e041a0f7e3937ab087d (patch) | |
| tree | 3654b9a019804635c448312d953ab578cc04b7b0 /contrib/cirrus | |
| parent | 38333970ba23338b1477f26e1807d21c74da8654 (diff) | |
| download | podman-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 'contrib/cirrus')
| -rw-r--r-- | contrib/cirrus/lib.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 667e24fd1..a285b133b 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -283,16 +283,16 @@ install_buildah() { ooe.sh sudo make install } -# Requires $GOPATH and $CRIO_COMMIT to be set +# Requires $GOPATH and $CONMON_COMMIT to be set install_conmon(){ - echo "Installing conmon from commit $CRIO_COMMIT" - req_env_var GOPATH CRIO_COMMIT - DEST="$GOPATH/src/github.com/cri-o/cri-o.git" + echo "Installing conmon from commit $CONMON_COMMIT" + req_env_var GOPATH CONMON_COMMIT + DEST="$GOPATH/src/github.com/containers/conmon.git" rm -rf "$DEST" - ooe.sh git clone https://github.com/cri-o/cri-o.git "$DEST" + ooe.sh git clone https://github.com/containers/conmon.git "$DEST" cd "$DEST" ooe.sh git fetch origin --tags - ooe.sh git checkout -q "$CRIO_COMMIT" + ooe.sh git checkout -q "$CONMON_COMMIT" ooe.sh make sudo install -D -m 755 bin/conmon /usr/libexec/podman/conmon } |