TUN-8130: Install go tool chain in /tmp on build agents

cloudflare · Jan 9, 2024 · ecd101d · ecd101d
1 parent cf5be91
commit ecd101d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/.teamcity/install-cloudflare-go.sh b/.teamcity/install-cloudflare-go.sh
@@ -1,3 +1,4 @@
+cd /tmp
 git clone -q https://github.com/cloudflare/go
 cd go/src
 # https://github.com/cloudflare/go/tree/34129e47042e214121b6bbff0ded4712debed18e is version go1.21.5-devel-cf

diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@ COPY . .
 RUN .teamcity/install-cloudflare-go.sh
 
 # compile cloudflared
-RUN PATH="/go/src/github.com/cloudflare/cloudflared/go/bin:$PATH" make cloudflared
+RUN PATH="/tmp/go/bin:$PATH" make cloudflared
 
 # use a distroless base image with glibc
 FROM gcr.io/distroless/base-debian11:nonroot

diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
@@ -10,10 +10,8 @@ COPY . .
 
 RUN .teamcity/install-cloudflare-go.sh
 
-RUN PATH="/go/src/github.com/cloudflare/cloudflared/go/bin:$PATH" go env
-
 # compile cloudflared
-RUN GOOS=linux GOARCH=amd64 PATH="/go/src/github.com/cloudflare/cloudflared/go/bin:$PATH" make cloudflared
+RUN GOOS=linux GOARCH=amd64 PATH="/tmp/go/bin:$PATH" make cloudflared
 
 # use a distroless base image with glibc
 FROM gcr.io/distroless/base-debian11:nonroot

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -11,7 +11,7 @@ COPY . .
 RUN .teamcity/install-cloudflare-go.sh
 
 # compile cloudflared
-RUN GOOS=linux GOARCH=arm64 PATH="/go/src/github.com/cloudflare/cloudflared/go/bin:$PATH" make cloudflared
+RUN GOOS=linux GOARCH=arm64 PATH="/tmp/go/bin:$PATH" make cloudflared
 
 # use a distroless base image with glibc
 FROM gcr.io/distroless/base-debian11:nonroot-arm64

diff --git a/dev.Dockerfile b/dev.Dockerfile
@@ -6,5 +6,5 @@ RUN apt-get update
 COPY . .
 RUN .teamcity/install-cloudflare-go.sh
 # compile cloudflared
-RUN PATH="/go/src/github.com/cloudflare/cloudflared/go/bin:$PATH" make cloudflared
+RUN PATH="/tmp/go/bin:$PATH" make cloudflared
 RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/