diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-08-21 17:18:52 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-08-21 17:24:55 +0200 |
| commit | 2bb5b4a9b4518ec145be0eef5803550963aa5798 (patch) | |
| tree | 4628397cc6622f6d0627dc69d63b744c87de847d | |
| parent | 1ad8fe52412c8cef215e5a5af312e5db680c3916 (diff) | |
| download | podman-2bb5b4a9b4518ec145be0eef5803550963aa5798.tar.gz podman-2bb5b4a9b4518ec145be0eef5803550963aa5798.tar.bz2 podman-2bb5b4a9b4518ec145be0eef5803550963aa5798.zip | |
Dockerfile.fedora: install cni plugins package
the version available on Fedora is updated, so we don't need to build
from source.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | Dockerfile.fedora | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 0f82fdc5c..429597f4f 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -27,36 +27,24 @@ RUN dnf -y install btrfs-progs-devel \ xz \ slirp4netns \ container-selinux \ + containernetworking-plugins \ iptables && dnf clean all -# Install CNI plugins -ENV CNI_COMMIT 485be65581341430f9106a194a98f0f2412245fb -ENV -RUN set -x \ - && export GOPATH="$(mktemp -d)" GOCACHE="$(mktemp -d)" \ - && git clone https://github.com/containernetworking/plugins.git "$GOPATH/src/github.com/containernetworking/plugins" \ - && cd "$GOPATH/src/github.com/containernetworking/plugins" \ - && git checkout -q "$CNI_COMMIT" \ - && ./build_linux.sh \ - && mkdir -p /usr/libexec/cni \ - && cp bin/* /usr/libexec/cni \ - && rm -rf "$GOPATH" - # Install ginkgo RUN set -x \ - && export GOPATH=/go \ + && export GOPATH=/go GOCACHE="$(mktemp -d)" \ && go get -u github.com/onsi/ginkgo/ginkgo \ && install -D -m 755 "$GOPATH"/bin/ginkgo /usr/bin/ # Install gomega RUN set -x \ - && export GOPATH=/go \ + && export GOPATH=/go GOCACHE="$(mktemp -d)" \ && go get github.com/onsi/gomega/... # Install conmon ENV CONMON_COMMIT 6f3572558b97bc60dd8f8c7f0807748e6ce2c440 RUN set -x \ - && export GOPATH="$(mktemp -d)" \ + && export GOPATH="$(mktemp -d)" GOCACHE="$(mktemp -d)" \ && 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 \ |