Skip to content

Commit ecd101d

Browse files
committed
TUN-8130: Install go tool chain in /tmp on build agents
1 parent cf5be91 commit ecd101d

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

.teamcity/install-cloudflare-go.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
cd /tmp
12
git clone -q https://github.com/cloudflare/go
23
cd go/src
34
# https://github.com/cloudflare/go/tree/34129e47042e214121b6bbff0ded4712debed18e is version go1.21.5-devel-cf

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ COPY . .
1515
RUN .teamcity/install-cloudflare-go.sh
1616

1717
# compile cloudflared
18-
RUN PATH="/go/src/github.com/cloudflare/cloudflared/go/bin:$PATH" make cloudflared
18+
RUN PATH="/tmp/go/bin:$PATH" make cloudflared
1919

2020
# use a distroless base image with glibc
2121
FROM gcr.io/distroless/base-debian11:nonroot

Dockerfile.amd64

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ COPY . .
1010

1111
RUN .teamcity/install-cloudflare-go.sh
1212

13-
RUN PATH="/go/src/github.com/cloudflare/cloudflared/go/bin:$PATH" go env
14-
1513
# compile cloudflared
16-
RUN GOOS=linux GOARCH=amd64 PATH="/go/src/github.com/cloudflare/cloudflared/go/bin:$PATH" make cloudflared
14+
RUN GOOS=linux GOARCH=amd64 PATH="/tmp/go/bin:$PATH" make cloudflared
1715

1816
# use a distroless base image with glibc
1917
FROM gcr.io/distroless/base-debian11:nonroot

Dockerfile.arm64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ COPY . .
1111
RUN .teamcity/install-cloudflare-go.sh
1212

1313
# compile cloudflared
14-
RUN GOOS=linux GOARCH=arm64 PATH="/go/src/github.com/cloudflare/cloudflared/go/bin:$PATH" make cloudflared
14+
RUN GOOS=linux GOARCH=arm64 PATH="/tmp/go/bin:$PATH" make cloudflared
1515

1616
# use a distroless base image with glibc
1717
FROM gcr.io/distroless/base-debian11:nonroot-arm64

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ RUN apt-get update
66
COPY . .
77
RUN .teamcity/install-cloudflare-go.sh
88
# compile cloudflared
9-
RUN PATH="/go/src/github.com/cloudflare/cloudflared/go/bin:$PATH" make cloudflared
9+
RUN PATH="/tmp/go/bin:$PATH" make cloudflared
1010
RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/

0 commit comments

Comments
 (0)