diff options
Diffstat (limited to 'Dockerfile.Fedora')
| -rw-r--r-- | Dockerfile.Fedora | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Dockerfile.Fedora b/Dockerfile.Fedora index 055d2b9e3..163f93ea0 100644 --- a/Dockerfile.Fedora +++ b/Dockerfile.Fedora @@ -1,7 +1,9 @@ FROM registry.fedoraproject.org/fedora:27 RUN dnf -y install btrfs-progs-devel \ + atomic-registries \ bzip2 \ + conmon \ device-mapper-devel \ findutils \ git \ @@ -19,9 +21,7 @@ RUN dnf -y install btrfs-progs-devel \ python \ which\ golang-github-cpuguy83-go-md2man \ - conmon \ procps-ng \ - atomic-registries \ iptables && dnf clean all # install bats @@ -33,7 +33,7 @@ RUN cd /tmp \ && rm -fr /tmp/bats # Install CNI plugins -ENV CNI_COMMIT 7480240de9749f9a0a5c8614b17f1f03e0c06ab9 +ENV CNI_COMMIT 412b6d31280682bb4fab4446f113c22ff1886554 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/containernetworking/plugins.git "$GOPATH/src/github.com/containernetworking/plugins" \ @@ -55,6 +55,19 @@ RUN set -x \ && export GOPATH=/go \ && go get github.com/onsi/gomega/... +# 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 config #RUN make install.cni RUN mkdir -p /etc/cni/net.d/ |