From 3aa63b2b941aac40c5e3639b0880922b842052ab Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 16 Jan 2018 17:33:56 -0500 Subject: 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 Closes: #151 Approved by: mheon --- Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Dockerfile') 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 \ -- cgit v1.2.3-54-g00ecf