Skip to content

Commit

Permalink
Merge pull request #97 from uselagoon/update-go-123
Browse files Browse the repository at this point in the history
Chore: Updates Go to 1.23
  • Loading branch information
bomoko authored Jan 30, 2025
2 parents 36ea33b + 66edbb7 commit 28d60ca
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 54 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.22.3-alpine3.18 as builder
FROM golang:1.23-alpine3.19 AS builder

COPY . /go/src/github.com/uselagoon/lagoon/services/insights-handler/
WORKDIR /go/src/github.com/uselagoon/lagoon/services/insights-handler/
Expand All @@ -15,7 +15,7 @@ COPY main.go main.go
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -a -o insights-handler main.go

# we pull the trivy binary from aquasec's alpine based image
FROM aquasec/trivy:0.54.1 as trivy
FROM aquasec/trivy:0.54.1 AS trivy

# Use distroless as minimal base image to package the insights-handler binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details
Expand All @@ -31,4 +31,4 @@ COPY --from=builder /go/src/github.com/uselagoon/lagoon/services/insights-handle
COPY default_filter_transformers.yaml /default_filter_transformers.yaml
USER 65532:65532

ENTRYPOINT ["/insights-handler"]
ENTRYPOINT ["/insights-handler"]
35 changes: 18 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,45 +1,46 @@
module github.com/uselagoon/lagoon/services/insights-handler

go 1.21
go 1.23

require (
github.com/Khan/genqlient v0.7.0
github.com/cheshir/go-mq v1.0.2
github.com/cheshir/go-mq v1.2.0
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/joho/godotenv v1.5.1
github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
)

require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/NeowayLabs/wabbit v0.0.0-20200409220312-12e68ab5b0c6 // indirect
github.com/NeowayLabs/wabbit v0.0.0-20210927194032-73ad61d1620e // indirect
github.com/containerd/containerd v1.7.13 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/goccy/go-json v0.10.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
github.com/pborman/uuid v1.2.0 // indirect
github.com/pborman/uuid v1.2.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rabbitmq/amqp091-go v1.10.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/rs/xid v1.5.0 // indirect
github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71 // indirect
github.com/rs/xid v1.6.0 // indirect
github.com/streadway/amqp v1.1.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/vektah/gqlparser/v2 v2.5.11 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
github.com/vektah/gqlparser/v2 v2.5.21 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
)

Expand All @@ -49,12 +50,12 @@ replace (
)

require (
github.com/CycloneDX/cyclonedx-go v0.9.0
github.com/CycloneDX/cyclonedx-go v0.9.2
github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 // indirect
github.com/fsouza/go-dockerclient v1.7.3 // indirect
github.com/minio/minio-go/v7 v7.0.75
github.com/minio/minio-go/v7 v7.0.82
github.com/tiago4orion/conjure v0.0.0-20150908101743-93cb30b9d218 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/net v0.33.0 // indirect
gopkg.in/yaml.v3 v3.0.1
)

Expand Down
Loading

0 comments on commit 28d60ca

Please sign in to comment.