Merge pull request #2217 from caseydavenport/automated-cherry-pick-of…

…-#2216-origin-release-v3.12 Automated cherry pick of #2216: Pin packr to v2.5.2.
projectcalico · Feb 24, 2020 · b6377bb · b6377bb
2 parents a95a116 + 3ed1c78
commit b6377bb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/bpf/packrd/packed-packr.go b/bpf/packrd/packed-packr.go
diff --git a/docker-build-images/bpf-clang-builder.Dockerfile.amd64 b/docker-build-images/bpf-clang-builder.Dockerfile.amd64
@@ -1,11 +1,15 @@
 FROM debian:buster-slim
 ENV GOPATH /go
 RUN apt-get update && \
-apt-get upgrade -y && \
-apt-get install -y --no-install-recommends \
-    llvm clang libbpf-dev linux-headers-amd64 make binutils git file iproute2 golang-go ca-certificates && \
-apt-get purge --auto-remove && \
-apt-get clean && \
-mkdir -p /src /go && \
-go get -u github.com/gobuffalo/packr/v2/packr2 && \
-rm -rf /go/src
+    apt-get upgrade -y && \
+    apt-get install -y --no-install-recommends \
+            llvm clang libbpf-dev linux-headers-amd64 make binutils git file iproute2 golang-go ca-certificates gcc && \
+    apt-get purge --auto-remove && \
+    apt-get clean
+ENV GO111MODULE=on
+RUN mkdir -p /src /go/src/github.com/gobuffalo/ && \
+    cd /go/src/github.com/gobuffalo && \
+    git clone --branch=v2.5.2 https://github.com/gobuffalo/packr.git && \
+    cd /go/src/github.com/gobuffalo/packr/v2/packr2 && \
+    go install . && \
+    rm -rf /go/src