From 2dffdf2a50cd02a55e7f68099bc819fc52e7b4a6 Mon Sep 17 00:00:00 2001
From: Gus Luxton <gus@gravitational.com>
Date: Tue, 26 Nov 2019 13:38:27 -0400
Subject: [PATCH] Fixes for CentOS 6 builds (#3178)

---
 build.assets/Dockerfile-centos6-fips | 1 -
 build.assets/Makefile                | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.assets/Dockerfile-centos6-fips b/build.assets/Dockerfile-centos6-fips
index 402974e5a9b..ff3c1061035 100644
--- a/build.assets/Dockerfile-centos6-fips
+++ b/build.assets/Dockerfile-centos6-fips
@@ -30,7 +30,6 @@ RUN (curl -L https://github.com/coreos/etcd/releases/download/v3.3.9/etcd-v3.3.9
 # 3) Erase Go bootstrap runtime and create build directories
 # 4) Print compiled Go version
 ARG RUNTIME
-#RUN mkdir -p /go-bootstrap && cd /go-bootstrap && curl https://go-boringcrypto.storage.googleapis.com/${GO_BOOTSTRAP_RUNTIME}b4.linux-amd64.tar.gz | tar xz && \
 RUN mkdir -p /go-bootstrap && cd /go-bootstrap && curl https://dl.google.com/go/${GO_BOOTSTRAP_RUNTIME}.linux-amd64.tar.gz | tar xz && \
     mkdir -p /opt && cd /opt && curl https://go-boringcrypto.storage.googleapis.com/${RUNTIME}b4.src.tar.gz | tar xz && \
     cd /opt/go/src && GOROOT_BOOTSTRAP=/go-bootstrap/go ./make.bash && \
diff --git a/build.assets/Makefile b/build.assets/Makefile
index 9f21a2f99d6..1d98031d741 100644
--- a/build.assets/Makefile
+++ b/build.assets/Makefile
@@ -185,7 +185,7 @@ release: bbox
 release-fips: bbox-fips
 	@if [ -z ${VERSION} ]; then echo "VERSION is not set"; exit 1; fi
 	docker run $(DOCKERFLAGS) -i $(NOROOT) $(BBOXFIPS) \
-		/usr/bin/make -C e release -e ADDFLAGS="$(ADDFLAGS)" OS=$(OS) ARCH=$(ARCH) RUNTIME=$(RUNTIME) FIPS=yes VERSION=$(VERSION) GITTAG=v$(VERSION)-fips
+		/usr/bin/make -C e release -e ADDFLAGS="$(ADDFLAGS)" OS=$(OS) ARCH=$(ARCH) RUNTIME=$(RUNTIME) FIPS=yes VERSION=$(VERSION) GITTAG=v$(VERSION)
 
 #
 # Create a Teleport package for CentOS 6 using the build container.
@@ -203,7 +203,7 @@ release-centos6: bbox-centos6
 release-centos6-fips: bbox-centos6-fips
 	@if [ -z ${VERSION} ]; then echo "VERSION is not set"; exit 1; fi
 	docker run $(DOCKERFLAGS) -i $(NOROOT) $(BBOXCENTOS6FIPS) \
-		/usr/bin/make -C e release -e ADDFLAGS="$(ADDFLAGS)" OS=$(OS) ARCH=$(ARCH) RUNTIME=$(RUNTIME) FIPS=yes VERSION=$(VERSION) GITTAG=v$(VERSION)-fips
+		/usr/bin/make -C e release -e ADDFLAGS="$(ADDFLAGS)" OS=$(OS) ARCH=$(ARCH) RUNTIME=$(RUNTIME) FIPS=yes VERSION=$(VERSION) GITTAG=v$(VERSION)
 
 #
 # Create a Windows Teleport package using the build container.