Skip to content

Commit bd64b06

Browse files
committed
Merge branch 'chore/cve-fixes-2026-04-22' into 'master'
chore(deps): bump pgx, pin Go 1.26.2, base image to docker:29.4.1 (#706) See merge request postgres-ai/database-lab!1139
2 parents cee1461 + 7afe174 commit bd64b06

8 files changed

Lines changed: 11 additions & 11 deletions

.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
29+
name: golang:1.26.2
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
12+
name: golang:1.26.2
1313
pull_policy: if-not-present
1414
interruptible: true # All jobs can be cancelled by default
1515

@@ -70,7 +70,7 @@ lint:
7070
build-binary-alpine:
7171
<<: *only_engine
7272
image:
73-
name: golang:1.26-alpine
73+
name: golang:1.26.2-alpine
7474
pull_policy: if-not-present
7575
stage: build-binary
7676
artifacts:

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:29.4.0@sha256:a6dd5322747a95cd8e3207bd8d415a8fd20ec34e9c00f06dc019cbd912013489
1+
FROM docker:29.4.1@sha256:c77e5d7912f9b137cc67051fdc2991d8f5ae22c55ddf532bb836dcb693a04940
22

33
# Install dependencies.
44
RUN apk upgrade --no-cache && 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:29.4.0@sha256:a6dd5322747a95cd8e3207bd8d415a8fd20ec34e9c00f06dc019cbd912013489
1+
FROM docker:29.4.1@sha256:c77e5d7912f9b137cc67051fdc2991d8f5ae22c55ddf532bb836dcb693a04940
22

33
# Install dependencies.
44
RUN apk upgrade --no-cache && 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:29.4.0@sha256:a6dd5322747a95cd8e3207bd8d415a8fd20ec34e9c00f06dc019cbd912013489
3+
FROM docker:29.4.1@sha256:c77e5d7912f9b137cc67051fdc2991d8f5ae22c55ddf532bb836dcb693a04940
44

55
# Install dependencies
66
RUN apk upgrade --no-cache \

engine/Dockerfile.dblab-server-debug

Lines changed: 2 additions & 2 deletions
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 AS build-env
4+
FROM golang:1.26.2 AS build-env
55

66
# Build Delve
77
RUN go install github.com/go-delve/delve/cmd/dlv@latest
@@ -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:29.4.0@sha256:a6dd5322747a95cd8e3207bd8d415a8fd20ec34e9c00f06dc019cbd912013489
15+
FROM docker:29.4.1@sha256:c77e5d7912f9b137cc67051fdc2991d8f5ae22c55ddf532bb836dcb693a04940
1616

1717
# Install dependencies
1818
# Install the pinned edge-repo zfs build before `apk upgrade`, then pass

engine/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/google/uuid v1.6.0
2222
github.com/gorilla/mux v1.8.1
2323
github.com/gorilla/websocket v1.5.3
24-
github.com/jackc/pgx/v5 v5.9.1
24+
github.com/jackc/pgx/v5 v5.9.2
2525
github.com/lib/pq v1.10.9
2626
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
2727
github.com/pkg/errors v0.9.1

engine/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI
116116
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
117117
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
118118
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
119-
github.com/jackc/pgx/v5 v5.9.1 h1:uwrxJXBnx76nyISkhr33kQLlUqjv7et7b9FjCen/tdc=
120-
github.com/jackc/pgx/v5 v5.9.1/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
119+
github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw=
120+
github.com/jackc/pgx/v5 v5.9.2/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
121121
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
122122
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
123123
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=

0 commit comments

Comments
 (0)