Merge pull request #53 from flowbi/merge/upstream-sync-2026-02-27

Sync with upstream sosedoff/pgweb up to v0.17.0

Author: ankitsejwal

.github/workflows/checks.yml

@@ -14,7 +14,7 @@ on:
       - "**.md"
 
 env:
-  GO_VERSION: "1.22"
+  GO_VERSION: "1.25"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -49,7 +49,7 @@ jobs:
           sudo rm -f /etc/apt/sources.list.d/pgdg.list
           curl --silent https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add
           echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | sudo tee /etc/apt/sources.list.d/pgdg.list
-          sudo apt-get update && sudo apt-get install -y postgresql-client-17
+          sudo apt-get update && sudo apt-get install -y postgresql-client-18
 
       - uses: actions/checkout@v4
         with:
@@ -98,9 +98,9 @@ jobs:
           fetch-depth: 0
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.57.1
+          version: v2.7.2
 
   fmt:
     name: fmt

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
       - "v*"
 
 env:
-  GO_VERSION: "1.22"
+  GO_VERSION: "1.25"
   CGO_ENABLED: 0
   DOCKER_REPOSITORY: flowbi/pgweb
   GHCR_REPOSITORY: flowbi/pgweb

.golangci.yml

@@ -0,0 +1,7 @@
+version: "2"
+linters:
+  disable:
+    - errcheck
+  settings:
+    staticcheck:
+      checks: ["all", "-ST1000", "-ST1003", "-ST1016", "-ST1020", "-ST1021", "-ST1022", "-ST1005", "-QF1004"]

CHANGELOG.md

@@ -102,6 +102,18 @@ Current [release](https://github.com/flowbi/pgweb/releases) is `0.16.19`.
 - `FIX` Fix typos in documentation and code
 - `FIX` Add execution time display for empty queries
 
+## Upstream 0.17.0 - 2025-11-22
+
+- `NEW` Add PGWEB_BOOKMARKS_DIR environment variable to configure bookmarks directory
+- `NEW` Update Dockerfile to use Golang 1.24 image, GH-821
+- `NEW` Bump go crypto package to 0.44.x, GH-820, GH-823
+- `NEW` Add PostgreSQL 18 support to Github Actions, GH-816
+- `NEW` Connect backend refactor, GH-801
+- `NEW` Add server settings view, GH-768
+- `NEW` Add exec time of empty queries, GH-763
+- `FIX` Minor typos, GH-764, GH-786
+- `FIX` Shorten git revision printed in the --version output, GH-770
+
 ## 0.16.2 - 2024-11-02
 
 - `FIX` Build a new Docker image with PostgreSQL 17 support

Dockerfile

@@ -1,11 +1,11 @@
 # ------------------------------------------------------------------------------
 # Builder Stage
 # ------------------------------------------------------------------------------
-FROM golang:1.22-bullseye AS build
+FROM golang:1.25-trixie AS build
 
 # Set default build argument for CGO_ENABLED
 ARG CGO_ENABLED=0
-ENV CGO_ENABLED ${CGO_ENABLED}
+ENV CGO_ENABLED=${CGO_ENABLED}
 
 WORKDIR /build
 
@@ -21,7 +21,7 @@ RUN make build
 # ------------------------------------------------------------------------------
 # Fetch signing key
 # ------------------------------------------------------------------------------
-FROM debian:bullseye-slim AS keyring
+FROM debian:trixie-slim AS keyring
 ADD https://www.postgresql.org/media/keys/ACCC4CF8.asc keyring.asc
 RUN apt-get update && \
     apt-get install -qq --no-install-recommends gpg
@@ -30,14 +30,14 @@ RUN gpg -o keyring.pgp --dearmor keyring.asc
 # ------------------------------------------------------------------------------
 # Release Stage
 # ------------------------------------------------------------------------------
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 ARG keyring=/usr/share/keyrings/postgresql-archive-keyring.pgp
 COPY --from=keyring /keyring.pgp $keyring
 RUN . /etc/os-release && \
     echo "deb [signed-by=${keyring}] http://apt.postgresql.org/pub/repos/apt/ ${VERSION_CODENAME}-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
     apt-get update && \
-    apt-get install -qq --no-install-recommends ca-certificates openssl netcat curl postgresql-client
+    apt-get install -qq --no-install-recommends ca-certificates openssl netcat-openbsd curl postgresql-client
 
 COPY --from=build /build/pgweb /usr/bin/pgweb
 

README.md

@@ -114,6 +114,39 @@ all supported PostgreSQL version with a single command:
 make test-all
 ```
 
+## CI/CD
+
+### PR Checks (`checks.yml`)
+
+On every pull request, the following checks run automatically:
+
+- **tests** — Go tests against PostgreSQL 16 on Ubuntu
+- **tests-windows** — Go tests on Windows (push to main only, skipped on PRs)
+- **lint** — golangci-lint v1.57.1
+- **fmt** — Go formatting check
+
+### Release Process (`release.yml`)
+
+Releases are triggered by pushing a version tag. The workflow builds and publishes Docker images to both Docker Hub and GitHub Container Registry.
+
+```bash
+# 1. Merge PR into main
+gh pr merge <pr-number> --repo flowbi/pgweb --merge
+
+# 2. Pull latest main
+git checkout main && git pull origin main
+
+# 3. Tag the release (match version in CHANGELOG.md)
+git tag v0.x.x
+
+# 4. Push the tag — this triggers the release workflow
+git push origin v0.x.x
+```
+
+The release workflow builds multi-platform images (`linux/amd64`, `linux/arm64`, `linux/arm/v7`) and pushes to:
+- `flowbi/pgweb:<version>` + `flowbi/pgweb:latest` on Docker Hub
+- `ghcr.io/flowbi/pgweb:<version>` + `ghcr.io/flowbi/pgweb:latest` on GHCR
+
 ## Contribute
 
 - Fork this repository

data/bookmark_with_ssh.toml

@@ -0,0 +1,12 @@
+host = "localhost"
+port = 5432
+user = "postgres"
+database = "mydatabase"
+ssl = "disable"
+
+[SSH]
+host = "ssh-host"
+user = "ssh-user"
+password = "ssh-password"
+key = "/path/to/key-file"
+keypassword = "key-file-password"

docker-compose-pg.yml

@@ -1,6 +1,4 @@
 ---
-version: "3.9"
-
 x-base: &base
   environment: &env
     POSTGRES_DB: pgweb
@@ -11,6 +9,16 @@ x-base: &base
     interval: 5s
 
 services:
+  postgres18:
+    <<: *base
+    image: postgres:18
+    ports:
+      - 5433:5432
+  postgres17:
+    <<: *base
+    image: postgres:17
+    ports:
+      - 5433:5432
   postgres16:
     <<: *base
     image: postgres:16

docker-compose.yml

@@ -1,6 +1,4 @@
 ---
-version: "3.9"
-
 services:
   postgres:
     container_name: pgweb-postgres

go.mod

@@ -1,57 +1,69 @@
 module github.com/flowbi/pgweb
 
-go 1.22
+go 1.25
+
+toolchain go1.25.4
 
 require (
 	github.com/BurntSushi/toml v1.1.0
 	github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5
-	github.com/gin-gonic/gin v1.9.1
+	github.com/gin-gonic/gin v1.11.0
 	github.com/jackc/pgpassfile v1.0.0
 	github.com/jessevdk/go-flags v1.5.0
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/lib/pq v1.10.5
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mr-tron/base58 v1.2.0
-	github.com/prometheus/client_golang v1.14.0
-	github.com/sirupsen/logrus v1.9.0
-	github.com/stretchr/testify v1.8.3
+	github.com/prometheus/client_golang v1.19.1
+	github.com/sirupsen/logrus v1.9.1
+	github.com/stretchr/testify v1.11.1
 	github.com/tuvistavie/securerandom v0.0.0-20140719024926-15512123a948
-	golang.org/x/crypto v0.9.0
+	golang.org/x/crypto v0.46.0
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/bytedance/gopkg v0.1.3 // indirect
+	github.com/bytedance/sonic v1.14.2 // indirect
+	github.com/bytedance/sonic/loader v0.4.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/cloudwego/base64x v0.1.6 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.12 // indirect
+	github.com/gin-contrib/sse v1.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.0 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/go-playground/validator/v10 v10.30.1 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/goccy/go-yaml v1.19.1 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.39.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.48.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/quic-go/qpack v0.6.0 // indirect
+	github.com/quic-go/quic-go v0.58.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	github.com/ugorji/go/codec v1.3.1 // indirect
+	go.uber.org/mock v0.6.0 // indirect
+	golang.org/x/arch v0.23.0 // indirect
+	golang.org/x/mod v0.31.0 // indirect
+	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
+	golang.org/x/tools v0.40.0 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )