Skip to content

Commit 2ce4eb1

Browse files
committed
Merge branch 'update-dependencies-2025-11-28' into 'master'
fix: update dependencies to address critical CVE vulnerabilities See merge request postgres-ai/database-lab!1066
2 parents c81c660 + ebb79fd commit 2ce4eb1

34 files changed

+260
-972
lines changed

CLAUDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
1010

1111
## Build/Test/Lint Commands
1212
- Build all components: `cd engine && make build`
13-
- Lint code: `cd engine && make lint`
13+
- Lint code: `cd engine && make run-lint`
1414
- Run unit tests: `cd engine && make test`
1515
- Run integration tests: `cd engine && make test-ci-integration`
1616
- Run a specific test: `cd engine && GO111MODULE=on go test -v ./path/to/package -run TestName`

engine/.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ linters-settings:
6363
- performance
6464
disabled-tags:
6565
- experimental
66+
staticcheck:
67+
checks: [ "all", "-SA1019" ] # TODO: fix deprecation warnings for old Docker API types in a separate MR
6668

6769
linters:
6870
enable:

engine/Dockerfile.ci-checker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker:20.10.24
1+
FROM docker:27.1.1
22

33
# Install dependencies.
44
RUN apk update && apk add --no-cache bash

engine/Dockerfile.dblab-cli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker:20.10.24
1+
FROM docker:27.1.1
22

33
# Install dependencies.
44
RUN apk update && apk add --no-cache bash jq tzdata

engine/Dockerfile.dblab-server

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# See Guides to learn how to start a container: https://postgres.ai/docs/how-to-guides/administration/engine-manage
22

3-
FROM docker:20.10.24
3+
FROM docker:27.1.1
44

55
# Install dependencies
66
RUN apk update \

engine/Dockerfile.dblab-server-debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN go install github.com/go-delve/delve/cmd/dlv@latest
1212
# RUN GO111MODULE=on CGO_ENABLED=0 go build -gcflags="all=-N -l" -o /dblab-server-debug ./cmd/database-lab/main.go
1313

1414
# Final stage
15-
FROM docker:20.10.12
15+
FROM docker:27.1.1
1616

1717
# Install dependencies
1818
RUN apk update \

engine/Dockerfile.dblab-server-zfs08

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# See Guides to learn how to start a container: https://postgres.ai/docs/how-to-guides/administration/engine-manage
22

3-
FROM docker:20.10.24
3+
FROM docker:27.1.1
44

55
# Install dependencies.
66
RUN apk update && apk add zfs=0.8.4-r0 --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.12/main \

engine/cmd/cli/templates/help.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Package templates contains custom template output.
66
package templates
77

8-
//nolint
8+
// nolint
99
const CustomAppHelpTemplate = `NAME:
1010
Database Lab CLI {{if .Version}}{{if not .HideVersion}}{{.Version}}{{end}}{{end}}
1111
@@ -35,7 +35,7 @@ CONTACT US: https://postgres.ai, team@postgres.ai
3535
3636
`
3737

38-
//nolint
38+
// nolint
3939
const CustomCommandHelpTemplate = `USAGE:
4040
{{if .UsageText}}{{.UsageText}}{{else}}{{.HelpName}}{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Category}}
4141
@@ -50,7 +50,7 @@ OPTIONS:
5050
{{end}}{{end}}
5151
`
5252

53-
//nolint
53+
// nolint
5454
const CustomSubcommandHelpTemplate = `USAGE:
5555
{{if .UsageText}}{{.UsageText}}{{else}}{{.HelpName}} command{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}
5656

engine/cmd/database-lab/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"syscall"
1919
"time"
2020

21-
"github.com/docker/docker/api/types"
21+
"github.com/docker/docker/api/types/network"
2222
"github.com/docker/docker/client"
2323
"github.com/pkg/errors"
2424

@@ -62,7 +62,7 @@ func main() {
6262

6363
config.ApplyGlobals(cfg)
6464

65-
docker, err := client.NewClientWithOpts(client.FromEnv)
65+
docker, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
6666
if err != nil {
6767
log.Fatal("Failed to create a Docker client:", err)
6868
}
@@ -273,7 +273,7 @@ func main() {
273273
func getNetworkGateway(docker *client.Client, internalNetworkID string) string {
274274
gateway := ""
275275

276-
networkResource, err := docker.NetworkInspect(context.Background(), internalNetworkID, types.NetworkInspectOptions{})
276+
networkResource, err := docker.NetworkInspect(context.Background(), internalNetworkID, network.InspectOptions{})
277277
if err != nil {
278278
log.Err(err.Error())
279279
return gateway

engine/cmd/runci/main.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"os"
88
"strings"
99

10-
"github.com/docker/docker/api/types"
1110
"github.com/docker/docker/api/types/network"
1211
"github.com/docker/docker/client"
1312
"github.com/pkg/errors"
@@ -22,7 +21,7 @@ import (
2221
)
2322

2423
func main() {
25-
dockerCLI, err := client.NewClientWithOpts(client.FromEnv)
24+
dockerCLI, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
2625
if err != nil {
2726
log.Fatal("Failed to create a Docker client:", err)
2827
}
@@ -129,7 +128,7 @@ func discoverNetwork(ctx context.Context, cfg *runci.Config, dockerCLI *client.C
129128

130129
for networkLabel, endpointSettings := range inspection.NetworkSettings.Networks {
131130
if strings.HasPrefix(networkLabel, networks.NetworkPrefix) {
132-
networkResource, err := dockerCLI.NetworkInspect(ctx, endpointSettings.NetworkID, types.NetworkInspectOptions{})
131+
networkResource, err := dockerCLI.NetworkInspect(ctx, endpointSettings.NetworkID, network.InspectOptions{})
133132
if err != nil {
134133
log.Err(err)
135134
continue

0 commit comments

Comments
 (0)