Dockerfile*: fix build for CNI plugins

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
containers · Aug 20, 2019 · c6a5bba · c6a5bba
1 parent 34fc1d0
commit c6a5bba
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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"