Skip to content

Commit 99dcdae

Browse files
committed
chore(docker): upgrade images to new config
1 parent a26c16b commit 99dcdae

File tree

6 files changed

+271
-277
lines changed

6 files changed

+271
-277
lines changed

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,19 +111,19 @@ git_override(
111111

112112
git_override(
113113
module_name = "com_github_buildbarn_bb_browser",
114-
commit = "9c1714be8cf55061c698b2e629e13496071e23a1",
114+
commit = "9b44996f7d6a04185f61e7752cbe8649aaa59f16",
115115
remote = "https://github.com/buildbarn/bb-browser.git",
116116
)
117117

118118
git_override(
119119
module_name = "com_github_buildbarn_bb_remote_execution",
120-
commit = "31d23d1a2b0cf4c6785bc96e3576e439063d6b7c",
120+
commit = "1c726bdc27e7793c685d8788913f8f91f59bc887",
121121
remote = "https://github.com/buildbarn/bb-remote-execution.git",
122122
)
123123

124124
git_override(
125125
module_name = "com_github_buildbarn_bb_storage",
126-
commit = "2600f229e4b68a92591109827f78b047a7fe4d01",
126+
commit = "1d733a37487a01416bda38eff6f61eb78103c7f0",
127127
remote = "https://github.com/buildbarn/bb-storage.git",
128128
)
129129

docker-compose/config/common.libsonnet

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,32 @@
22
blobstore: {
33
contentAddressableStorage: {
44
sharding: {
5-
hashInitialization: 11946695773637837490,
6-
shards: [
7-
{
5+
shards: {
6+
"0": {
87
backend: { grpc: { address: 'storage-0:8981' } },
98
weight: 1,
109
},
11-
{
10+
"1": {
1211
backend: { grpc: { address: 'storage-1:8981' } },
1312
weight: 1,
1413
},
15-
],
14+
},
1615
},
1716
},
1817
actionCache: {
1918
completenessChecking: {
2019
backend: {
2120
sharding: {
22-
hashInitialization: 14897363947481274433,
23-
shards: [
24-
{
21+
shards: {
22+
"0": {
2523
backend: { grpc: { address: 'storage-0:8981' } },
2624
weight: 1,
2725
},
28-
{
26+
"1": {
2927
backend: { grpc: { address: 'storage-1:8981' } },
3028
weight: 1,
3129
},
32-
],
30+
},
3331
},
3432
},
3533
maximumTotalTreeSizeBytes: 64 * 1024 * 1024,

go.mod

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -20,123 +20,123 @@ replace cloud.google.com/go/storage v1.45.0 => cloud.google.com/go/storage v1.43
2020

2121
require (
2222
github.com/bazelbuild/rules_go v0.53.0
23-
github.com/buildbarn/bb-browser v0.0.0-20250212055122-9c1714be8cf5
24-
github.com/buildbarn/bb-remote-execution v0.0.0-20250201092335-31d23d1a2b0c
25-
github.com/buildbarn/bb-storage v0.0.0-20250213085125-2600f229e4b6
23+
github.com/buildbarn/bb-browser v0.0.0-20250414180739-9b44996f7d6a
24+
github.com/buildbarn/bb-remote-execution v0.0.0-20250411124310-1c726bdc27e7
25+
github.com/buildbarn/bb-storage v0.0.0-20250408112116-1d733a37487a
2626
golang.org/x/lint v0.0.0-20241112194109-818c5a804067
2727
mvdan.cc/gofumpt v0.7.0
2828
)
2929

3030
require (
31-
cel.dev/expr v0.19.0 // indirect
32-
cloud.google.com/go v0.118.0 // indirect
33-
cloud.google.com/go/auth v0.14.1 // indirect
34-
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
31+
cel.dev/expr v0.23.1 // indirect
32+
cloud.google.com/go v0.120.0 // indirect
33+
cloud.google.com/go/auth v0.15.0 // indirect
34+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
3535
cloud.google.com/go/compute/metadata v0.6.0 // indirect
36-
cloud.google.com/go/iam v1.3.1 // indirect
37-
cloud.google.com/go/longrunning v0.6.4 // indirect
38-
cloud.google.com/go/monitoring v1.22.1 // indirect
39-
cloud.google.com/go/storage v1.50.0 // indirect
36+
cloud.google.com/go/iam v1.5.0 // indirect
37+
cloud.google.com/go/longrunning v0.6.6 // indirect
38+
cloud.google.com/go/monitoring v1.24.1 // indirect
39+
cloud.google.com/go/storage v1.51.0 // indirect
40+
codeberg.org/go-fonts/liberation v0.5.0 // indirect
41+
codeberg.org/go-latex/latex v0.1.0 // indirect
42+
codeberg.org/go-pdf/fpdf v0.11.0 // indirect
4043
git.sr.ht/~sbinet/gg v0.6.0 // indirect
41-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
42-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 // indirect
43-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect
44+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
45+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
46+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
4447
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
4548
github.com/aohorodnyk/mimeheader v0.0.6 // indirect
46-
github.com/aws/aws-sdk-go-v2 v1.36.1 // indirect
47-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
48-
github.com/aws/aws-sdk-go-v2/config v1.29.6 // indirect
49-
github.com/aws/aws-sdk-go-v2/credentials v1.17.59 // indirect
50-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28 // indirect
51-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 // indirect
52-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32 // indirect
53-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
54-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.32 // indirect
55-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
56-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.0 // indirect
57-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 // indirect
58-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.13 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/s3 v1.76.1 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.15 // indirect
61-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14 // indirect
62-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.14 // indirect
63-
github.com/aws/smithy-go v1.22.2 // indirect
64-
github.com/bazelbuild/remote-apis v0.0.0-20250211041012-7f922028fcfa // indirect
49+
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
50+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
51+
github.com/aws/aws-sdk-go-v2/config v1.29.14 // indirect
52+
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
53+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
54+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
55+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
56+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
57+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 // indirect
60+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
61+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
62+
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.2 // indirect
63+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
64+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
65+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
66+
github.com/aws/smithy-go v1.22.3 // indirect
67+
github.com/bazelbuild/remote-apis v0.0.0-20250410133023-536ec595e1df // indirect
6568
github.com/beorn7/perks v1.0.1 // indirect
69+
github.com/buildbarn/go-sha256tree v0.0.0-20250310211320-0f70f20e855b // indirect
6670
github.com/buildbarn/go-xdr v0.0.0-20240702182809-236788cf9e89 // indirect
6771
github.com/buildkite/terminal-to-html v3.2.0+incompatible // indirect
6872
github.com/campoy/embedmd v1.0.0 // indirect
69-
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
7073
github.com/cespare/xxhash/v2 v2.3.0 // indirect
71-
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
74+
github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f // indirect
7275
github.com/dustin/go-humanize v1.0.1 // indirect
73-
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
76+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
7477
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
7578
github.com/felixge/httpsnoop v1.0.4 // indirect
76-
github.com/fsnotify/fsnotify v1.8.0 // indirect
79+
github.com/fsnotify/fsnotify v1.9.0 // indirect
7780
github.com/fxtlabs/primes v0.0.0-20150821004651-dad82d10a449 // indirect
78-
github.com/go-fonts/liberation v0.3.3 // indirect
79-
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
80-
github.com/go-latex/latex v0.0.0-20240709081214-31cef3c7570e // indirect
81+
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
8182
github.com/go-logr/logr v1.4.2 // indirect
8283
github.com/go-logr/stdr v1.2.2 // indirect
83-
github.com/go-pdf/fpdf v0.9.0 // indirect
8484
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
8585
github.com/golang/protobuf v1.5.4 // indirect
86-
github.com/google/go-cmp v0.6.0 // indirect
86+
github.com/google/go-cmp v0.7.0 // indirect
8787
github.com/google/go-jsonnet v0.20.0 // indirect
8888
github.com/google/s2a-go v0.1.9 // indirect
8989
github.com/google/uuid v1.6.0 // indirect
90-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
90+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
9191
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
9292
github.com/gorilla/mux v1.8.1 // indirect
9393
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
9494
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
95-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
96-
github.com/hanwen/go-fuse/v2 v2.6.4 // indirect
95+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
96+
github.com/hanwen/go-fuse/v2 v2.7.2 // indirect
9797
github.com/jmespath/go-jmespath v0.4.0 // indirect
9898
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
99-
github.com/klauspost/compress v1.17.11 // indirect
99+
github.com/klauspost/compress v1.18.0 // indirect
100100
github.com/lazybeaver/xorshift v0.0.0-20170702203709-ce511d4823dd // indirect
101101
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
102102
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
103103
github.com/pmezard/go-difflib v1.0.0 // indirect
104-
github.com/prometheus/client_golang v1.20.5 // indirect
105-
github.com/prometheus/client_model v0.6.1 // indirect
106-
github.com/prometheus/common v0.62.0 // indirect
107-
github.com/prometheus/procfs v0.15.1 // indirect
104+
github.com/prometheus/client_golang v1.22.0 // indirect
105+
github.com/prometheus/client_model v0.6.2 // indirect
106+
github.com/prometheus/common v0.63.0 // indirect
107+
github.com/prometheus/procfs v0.16.0 // indirect
108108
github.com/sercand/kuberesolver/v5 v5.1.1 // indirect
109109
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
110-
go.opentelemetry.io/contrib/detectors/gcp v1.32.0 // indirect
111-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
112-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
113-
go.opentelemetry.io/contrib/propagators/b3 v1.34.0 // indirect
114-
go.opentelemetry.io/otel v1.34.0 // indirect
110+
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
111+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
112+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
113+
go.opentelemetry.io/contrib/propagators/b3 v1.35.0 // indirect
114+
go.opentelemetry.io/otel v1.35.0 // indirect
115115
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
116-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
117-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
118-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
119-
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
120-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
116+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
117+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
118+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
119+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
120+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
121121
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
122-
golang.org/x/crypto v0.33.0 // indirect
123-
golang.org/x/image v0.22.0 // indirect
124-
golang.org/x/mod v0.22.0 // indirect
125-
golang.org/x/net v0.35.0 // indirect
126-
golang.org/x/oauth2 v0.26.0 // indirect
127-
golang.org/x/sync v0.11.0 // indirect
128-
golang.org/x/sys v0.30.0 // indirect
129-
golang.org/x/text v0.22.0 // indirect
130-
golang.org/x/time v0.10.0 // indirect
131-
golang.org/x/tools v0.27.0 // indirect
132-
gonum.org/v1/plot v0.15.0 // indirect
133-
google.golang.org/api v0.221.0 // indirect
134-
google.golang.org/genproto v0.0.0-20250115164207-1a7da9e5054f // indirect
135-
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
136-
google.golang.org/genproto/googleapis/bytestream v0.0.0-20250212204824-5a70512c5d8b // indirect
137-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b // indirect
138-
google.golang.org/grpc v1.70.0 // indirect
122+
golang.org/x/crypto v0.37.0 // indirect
123+
golang.org/x/image v0.26.0 // indirect
124+
golang.org/x/mod v0.24.0 // indirect
125+
golang.org/x/net v0.39.0 // indirect
126+
golang.org/x/oauth2 v0.29.0 // indirect
127+
golang.org/x/sync v0.13.0 // indirect
128+
golang.org/x/sys v0.32.0 // indirect
129+
golang.org/x/text v0.24.0 // indirect
130+
golang.org/x/time v0.11.0 // indirect
131+
golang.org/x/tools v0.32.0 // indirect
132+
gonum.org/v1/plot v0.16.0 // indirect
133+
google.golang.org/api v0.228.0 // indirect
134+
google.golang.org/genproto v0.0.0-20250409194420-de1ac958c67a // indirect
135+
google.golang.org/genproto/googleapis/api v0.0.0-20250409194420-de1ac958c67a // indirect
136+
google.golang.org/genproto/googleapis/bytestream v0.0.0-20250409194420-de1ac958c67a // indirect
137+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250409194420-de1ac958c67a // indirect
138+
google.golang.org/grpc v1.71.1 // indirect
139139
google.golang.org/grpc/security/advancedtls v1.0.0 // indirect
140-
google.golang.org/protobuf v1.36.5 // indirect
140+
google.golang.org/protobuf v1.36.6 // indirect
141141
sigs.k8s.io/yaml v1.4.0 // indirect
142142
)

0 commit comments

Comments
 (0)