summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-20 22:48:11 +0200
committerGitHub <noreply@github.com>2019-08-20 22:48:11 +0200
commit1ad8fe52412c8cef215e5a5af312e5db680c3916 (patch)
tree6ecaf089c04cf82a26274442f8b56006ef1dc5d7
parentf618bc3259701fd7d3c1fc90d0ec3812571fa0ab (diff)
parentc6a5bbab94f389d7ad0ad3468a50ab94c9db9e27 (diff)
downloadpodman-1ad8fe52412c8cef215e5a5af312e5db680c3916.tar.gz
podman-1ad8fe52412c8cef215e5a5af312e5db680c3916.tar.bz2
podman-1ad8fe52412c8cef215e5a5af312e5db680c3916.zip
Merge pull request #3856 from giuseppe/fix-dockerfile-cni
Dockerfile*: fix build for CNI plugins
-rw-r--r--Dockerfile4
-rw-r--r--Dockerfile.centos4
-rw-r--r--Dockerfile.fedora5
3 files changed, 7 insertions, 6 deletions
diff --git a/Dockerfile b/Dockerfile
index 40726ae09..1f51cd874 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,11 +70,11 @@ RUN set -x \
# Install CNI plugins
ENV CNI_COMMIT 485be65581341430f9106a194a98f0f2412245fb
RUN set -x \
- && export GOPATH="$(mktemp -d)" \
+ && 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.sh \
+ && ./build_linux.sh \
&& mkdir -p /usr/libexec/cni \
&& cp bin/* /usr/libexec/cni \
&& rm -rf "$GOPATH"
diff --git a/Dockerfile.centos b/Dockerfile.centos
index f0d184485..513c4bdfd 100644
--- a/Dockerfile.centos
+++ b/Dockerfile.centos
@@ -29,11 +29,11 @@ RUN yum -y install btrfs-progs-devel \
# Install CNI plugins
ENV CNI_COMMIT 485be65581341430f9106a194a98f0f2412245fb
RUN set -x \
- && export GOPATH="$(mktemp -d)" \
+ && 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.sh \
+ && ./build_linux.sh \
&& mkdir -p /usr/libexec/cni \
&& cp bin/* /usr/libexec/cni \
&& rm -rf "$GOPATH"
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 48ca78bb5..0f82fdc5c 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -31,12 +31,13 @@ RUN dnf -y install btrfs-progs-devel \
# Install CNI plugins
ENV CNI_COMMIT 485be65581341430f9106a194a98f0f2412245fb
+ENV
RUN set -x \
- && export GOPATH="$(mktemp -d)" \
+ && 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.sh \
+ && ./build_linux.sh \
&& mkdir -p /usr/libexec/cni \
&& cp bin/* /usr/libexec/cni \
&& rm -rf "$GOPATH"