Skip to content

Commit

Permalink
Build: use 1.22 go builder (content-services#894)
Browse files Browse the repository at this point in the history
  • Loading branch information
jlsherrill authored Nov 19, 2024
1 parent 1074f4f commit cfd58ea
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 60 deletions.
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# https://github.com/quay/claircore/actions/workflows/golang-image.yml
# https://github.com/quay/claircore/blob/main/.github/workflows/golang-image.yml
FROM quay.io/projectquay/golang:1.23 as builder
FROM registry.redhat.io/ubi9/go-toolset:latest as builder

WORKDIR /go/src/app
COPY . .
Expand Down
8 changes: 6 additions & 2 deletions cmd/external-repos/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"fmt"
"os"
"slices"
"sort"
"strconv"
"sync"
Expand Down Expand Up @@ -302,7 +301,12 @@ func pulpOrphanCleanup(ctx context.Context, db *gorm.DB, batchSize int) error {
log.Panic().Err(err).Msg("orphan cleanup error: error listing orgs")
}

for batch := range slices.Chunk(domains, batchSize) {
for i := 0; i < len(domains); i += batchSize {
end := i + batchSize
if end > len(domains) {
end = len(domains)
}
batch := domains[i:end]
wg := sync.WaitGroup{}
for _, domain := range batch {
org := domain.OrgId
Expand Down
39 changes: 20 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/content-services/content-sources-backend

go 1.23
go 1.22.7

require (
github.com/ProtonMail/go-crypto v1.1.2
github.com/content-services/lecho/v3 v3.5.2
github.com/content-services/tang v0.0.9
github.com/content-services/tang v0.0.10
github.com/content-services/yummy v1.0.13
github.com/getkin/kin-openapi v0.127.1-0.20240830113739-c606b5546b12
github.com/go-openapi/spec v0.21.0 // indirect
Expand Down Expand Up @@ -38,12 +38,12 @@ require (
github.com/IBM/sarama v1.43.3
github.com/archdx/zerolog-sentry v1.8.5
github.com/aws/aws-sdk-go-v2 v1.32.4
github.com/aws/aws-sdk-go-v2/credentials v1.17.44
github.com/aws/aws-sdk-go-v2/credentials v1.17.45
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.43.2
github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2 v2.15.2
github.com/cloudevents/sdk-go/v2 v2.15.2
github.com/content-services/caliri/release/v4 v4.4.18
github.com/content-services/zest/release/v2024 v2024.11.1731339290
github.com/content-services/caliri/release/v4 v4.4.19
github.com/content-services/zest/release/v2024 v2024.11.1731697894
github.com/getsentry/sentry-go v0.29.1
github.com/jackc/pgx-zerolog v0.0.0-20230315001418-f978528409eb
github.com/jackc/pgx/v5 v5.7.1
Expand All @@ -53,7 +53,7 @@ require (
github.com/redis/go-redis/v9 v9.7.0
github.com/xdg/scram v1.0.5
go.uber.org/goleak v1.3.0
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
)

require (
Expand All @@ -71,7 +71,7 @@ require (
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Expand All @@ -84,7 +84,8 @@ require (
github.com/xdg/stringprep v1.0.3 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/dl v0.0.0-20241106222207-4e0968199959 // indirect
golang.org/x/sync v0.9.0 // indirect
)

require (
Expand All @@ -93,14 +94,14 @@ require (
github.com/RedHatInsights/insights-operator-utils v1.25.12
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.23 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.23 // indirect
github.com/aws/smithy-go v1.22.0 // indirect
github.com/aws/smithy-go v1.22.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cloudflare/circl v1.4.0 // indirect
github.com/cloudflare/circl v1.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
Expand All @@ -120,7 +121,7 @@ require (
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.57.0 // indirect
github.com/prometheus/common v0.60.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand All @@ -129,13 +130,13 @@ require (
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.25.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
golang.org/x/crypto v0.29.0 // indirect
golang.org/x/net v0.31.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/time v0.8.0 // indirect
golang.org/x/tools v0.27.0 // indirect
google.golang.org/protobuf v1.35.2 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit cfd58ea

Please sign in to comment.