containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3868 from giuseppe/dockerfile-cni-rpm 

Dockerfile.fedora: install cni plugins package
This commit is contained in:
OpenShift Merge Robot 2019-08-22 03:41:57 -07:00 committed by GitHub
parent ecc5cc532a 2bb5b4a9b4
commit 34f902572d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Dockerfile.fedora
View File

@ -27,36 +27,24 @@ RUN dnf -y install btrfs-progs-devel \
xz \ xz \
slirp4netns \ slirp4netns \
container-selinux \ container-selinux \
containernetworking-plugins \
iptables && dnf clean all 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 # Install ginkgo
RUN set -x \ RUN set -x \
&& export GOPATH=/go \ && export GOPATH=/go GOCACHE="$(mktemp -d)" \
&& go get -u github.com/onsi/ginkgo/ginkgo \ && go get -u github.com/onsi/ginkgo/ginkgo \
&& install -D -m 755 "$GOPATH"/bin/ginkgo /usr/bin/ && install -D -m 755 "$GOPATH"/bin/ginkgo /usr/bin/
# Install gomega # Install gomega
RUN set -x \ RUN set -x \
&& export GOPATH=/go \ && export GOPATH=/go GOCACHE="$(mktemp -d)" \
&& go get github.com/onsi/gomega/... && go get github.com/onsi/gomega/...
# Install conmon # Install conmon
ENV CONMON_COMMIT 6f3572558b97bc60dd8f8c7f0807748e6ce2c440 ENV CONMON_COMMIT 6f3572558b97bc60dd8f8c7f0807748e6ce2c440
RUN set -x \ 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" \ && git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \
&& cd "$GOPATH/src/github.com/containers/conmon.git" \ && cd "$GOPATH/src/github.com/containers/conmon.git" \
&& git fetch origin --tags \ && git fetch origin --tags \