From 3ed1c78436009fc5b69b3740571b2f1d11da595c Mon Sep 17 00:00:00 2001
From: Shaun Crampton <shaun@tigera.io>
Date: Thu, 6 Feb 2020 15:32:53 +0000
Subject: [PATCH] Pin packr to v2.5.2.

---
 bpf/packrd/packed-packr.go                    |  1 +
 .../bpf-clang-builder.Dockerfile.amd64        | 20 +++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/bpf/packrd/packed-packr.go b/bpf/packrd/packed-packr.go
index 3c3d07de5d..144555d17a 100644
--- a/bpf/packrd/packed-packr.go
+++ b/bpf/packrd/packed-packr.go
@@ -33,5 +33,6 @@ var _ = func() error {
 		b := packr.New("xdp", "./xdp/generated")
 		b.SetResolver("xdp.o", packr.Pointer{ForwardBox: gk, ForwardPath: "ad15098d1cedf7524395e290eb19dcab"})
 	}()
+
 	return nil
 }()
diff --git a/docker-build-images/bpf-clang-builder.Dockerfile.amd64 b/docker-build-images/bpf-clang-builder.Dockerfile.amd64
index 6ed86d2916..a7a9c3de72 100644
--- 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