Skip to content

Commit 8aa1b4c

Browse files
committed
Merge branch 'fix/runtime-image-cves-go-1.26.7' into 'master'
chore(deps): bump Go to 1.26.7 and x/mod to v0.40.0 for CVEs Closes #761 See merge request postgres-ai/database-lab!1183
2 parents 9bb13c2 + e26b86b commit 8aa1b4c

6 files changed

Lines changed: 10 additions & 9 deletions

File tree

.gitlab-ci-security.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ cve-govulncheck:
2626
<<: *security_rules
2727
stage: security
2828
image:
29-
name: golang:1.26.4
29+
name: golang:1.26.7
3030
pull_policy: if-not-present
3131
before_script:
3232
- go install golang.org/x/vuln/cmd/govulncheck@latest

engine/.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ workflow:
99

1010
default:
1111
image:
12-
name: golang:1.26.5
12+
name: golang:1.26.7
1313
pull_policy: if-not-present
1414
interruptible: true # All jobs can be cancelled by default
1515

@@ -71,7 +71,7 @@ lint:
7171
build-binary-alpine:
7272
<<: *only_engine
7373
image:
74-
name: golang:1.26.5-alpine
74+
name: golang:1.26.7-alpine
7575
pull_policy: if-not-present
7676
stage: build-binary
7777
artifacts:

engine/Dockerfile.dblab-server-debug

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

33
# Compile stage
4-
FROM golang:1.26.5 AS build-env
4+
FROM golang:1.26.7 AS build-env
55

66
# Build Delve
77
RUN go install github.com/go-delve/delve/cmd/dlv@latest

engine/Dockerfile.rds-refresh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
FROM alpine:3.23
1+
FROM alpine:3.23@sha256:5b10f432ef3da1b8d4c7eb6c487f2f5a8f096bc91145e68878dd4a5019afde11
22

3-
RUN apk add --no-cache ca-certificates tzdata
3+
RUN apk upgrade --no-cache \
4+
&& apk add --no-cache ca-certificates tzdata
45

56
# create non-root user
67
RUN adduser -D -u 1000 appuser

engine/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ require (
3636
github.com/urfave/cli/v2 v2.25.7
3737
github.com/wagslane/go-password-validator v0.3.0
3838
golang.org/x/crypto v0.52.0
39-
golang.org/x/mod v0.37.0
39+
golang.org/x/mod v0.40.0
4040
golang.org/x/oauth2 v0.36.0
4141
golang.org/x/term v0.43.0
4242
gopkg.in/yaml.v2 v2.4.0

engine/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@ go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
253253
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
254254
golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
255255
golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
256-
golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
257-
golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
256+
golang.org/x/mod v0.40.0 h1:hUv+3cXcdRHz08UmSiOob7sadHig73uo5bkXxQ/tvUs=
257+
golang.org/x/mod v0.40.0/go.mod h1:0/weTWkPWGBikyTWAX3dkjVztMmBA5hM0DH6BElSupE=
258258
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
259259
golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
260260
golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=

0 commit comments

Comments
 (0)