Skip to content

Commit a094982

Browse files
author
Tom Downes
committed
Update Go build environment
1 parent 2b11d75 commit a094982

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM golang:1.18-alpine as build
1+
FROM golang:1.24-alpine as build
22

33
RUN apk add --no-cache ca-certificates git
44
WORKDIR $GOPATH/src/github.com/contentful-labs/terraform-diff
55

66
COPY . ./
77
RUN CGO_ENABLED=0 GOOS=linux go build -mod=vendor -a -tags netgo -ldflags '-w' .
88

9-
FROM alpine:3.17
9+
FROM alpine:3.22
1010
RUN apk add --no-cache git
1111
COPY --from=build /go/src/github.com/contentful-labs/terraform-diff/terraform-diff terraform-diff
1212
RUN git config --global --add safe.directory '*'

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ build:
99
CGO_ENABLED=0 GOOS=linux go build -mod=vendor -a -tags netgo -ldflags '-w' -buildvcs=false .
1010

1111
docker-test:
12-
docker run -t -v $$PWD:/go/src/github.com/contentful-labs/terraform-diff -w /go/src/github.com/contentful-labs/terraform-diff golang:1.20 make test
12+
docker run -t -v $$PWD:/go/src/github.com/contentful-labs/terraform-diff -w /go/src/github.com/contentful-labs/terraform-diff golang:1.24 make test
1313

1414
docker-build:
15-
docker run -t -v $$PWD:/go/src/github.com/contentful-labs/terraform-diff -w /go/src/github.com/contentful-labs/terraform-diff golang:1.20 make build
15+
docker run -t -v $$PWD:/go/src/github.com/contentful-labs/terraform-diff -w /go/src/github.com/contentful-labs/terraform-diff golang:1.24 make build
1616

1717
docker-image:
1818
docker build -t contentful-labs/terraform-diff:latest .

0 commit comments

Comments
 (0)