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 /Dockerfile.fedora | |
| 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 'Dockerfile.fedora')
| -rw-r--r-- | Dockerfile.fedora | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 6f0482c63..290fe3f82 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -68,15 +68,14 @@ RUN set -x \ && install -D -m 755 "$GOPATH"/bin/easyjson /usr/bin/ # Install conmon -ENV CRIO_COMMIT 7a283c391abb7bd25086a8ff91dbb36ebdd24466 +ENV CONMON_COMMIT f02c053eb37010fc76d1e2966de7f2cb9f969ef2 RUN set -x \ && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/cri-o/cri-o.git "$GOPATH/src/github.com/cri-o/cri-o.git" \ - && cd "$GOPATH/src/github.com/cri-o/cri-o.git" \ + && git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \ + && cd "$GOPATH/src/github.com/containers/conmon.git" \ && git fetch origin --tags \ - && git checkout -q "$CRIO_COMMIT" \ + && git checkout -q "$CONMON_COMMIT" \ && make \ - && make bin/conmon \ && install -D -m 755 bin/conmon /usr/libexec/podman/conmon \ && rm -rf "$GOPATH" |