diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-22 03:41:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-22 03:41:57 -0700 |
| commit | 34f902572d15f4482aedae3859f0c83c56bd8437 (patch) | |
| tree | f9e5ee12a291e83e63be370763ad3ad30dfc12c7 | |
| parent | ecc5cc532a26b1fa94ec74a264df156501d4f9dd (diff) | |
| parent | 2bb5b4a9b4518ec145be0eef5803550963aa5798 (diff) | |
| download | podman-34f902572d15f4482aedae3859f0c83c56bd8437.tar.gz podman-34f902572d15f4482aedae3859f0c83c56bd8437.tar.bz2 podman-34f902572d15f4482aedae3859f0c83c56bd8437.zip | |
Merge pull request #3868 from giuseppe/dockerfile-cni-rpm
Dockerfile.fedora: install cni plugins package
| -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 \ |