diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-01-16 17:33:56 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-27 06:48:20 +0000 |
| commit | 3aa63b2b941aac40c5e3639b0880922b842052ab (patch) | |
| tree | 83bc6337500b3f5ef0f94a0f94f87f6a3549f01b /Dockerfile | |
| parent | fb58b873981d2fd0d4f97036afab2aa2ce9e1633 (diff) | |
| download | podman-3aa63b2b941aac40c5e3639b0880922b842052ab.tar.gz podman-3aa63b2b941aac40c5e3639b0880922b842052ab.tar.bz2 podman-3aa63b2b941aac40c5e3639b0880922b842052ab.zip | |
Remove conmon, get package from CRI-O
conmon should not be built in two different places.
conmon is now a separate package in Fedora so we can just
add requires, for use on Ubuntu we can just require cri-o to
be installed.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #151
Approved by: mheon
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile index b562ddd1f..c046c6ad3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,6 +67,19 @@ RUN set -x \ && cp runc /usr/bin/runc \ && rm -rf "$GOPATH" +# Install conmon +ENV CRIO_COMMIT 814c6ab0913d827543696b366048056a31d9529c +RUN set -x \ + && export GOPATH="$(mktemp -d)" \ + && git clone https://github.com/kubernetes-incubator/cri-o.git "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \ + && cd "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \ + && git fetch origin --tags \ + && git checkout -q "$CRIO_COMMIT" \ + && mkdir bin \ + && make conmon \ + && install -D -m 755 bin/conmon /usr/libexec/crio/conmon \ + && rm -rf "$GOPATH" + # Install CNI plugins ENV CNI_COMMIT 7480240de9749f9a0a5c8614b17f1f03e0c06ab9 RUN set -x \ |