From 68968ea169304f59deff556f91bb8857b11021db Mon Sep 17 00:00:00 2001
From: Lars Greiving <lars.greiving@finstreet.de>
Date: Tue, 5 May 2026 14:17:10 +0200
Subject: [PATCH 1/2] Default to postgres-client-17

---
 features/src/postgres-client/README.md                 | 2 +-
 features/src/postgres-client/devcontainer-feature.json | 4 ++--
 features/src/postgres-client/install.sh                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/src/postgres-client/README.md b/features/src/postgres-client/README.md
index dd446b4..17940d1 100644
--- a/features/src/postgres-client/README.md
+++ b/features/src/postgres-client/README.md
@@ -16,7 +16,7 @@ service using the official [Postgres docker image](https://hub.docker.com/_/post
 ## Options
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| version | The postgres-client version | string | 15 |
+| version | The postgres-client version | string | 17 |
 
 ## Customizations
 
diff --git a/features/src/postgres-client/devcontainer-feature.json b/features/src/postgres-client/devcontainer-feature.json
index 862c5b7..2635f04 100644
--- a/features/src/postgres-client/devcontainer-feature.json
+++ b/features/src/postgres-client/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "postgres-client",
-    "version": "1.1.3",
+    "version": "1.2.0",
     "name": "Postgres Client",
     "description": "Installs needed client-side dependencies for Rails apps using Postgres.",
     "documentationURL": "https://github.com/rails/devcontainer/tree/main/features/src/postgres-client",
@@ -8,7 +8,7 @@
     "options": {
         "version": {
             "type": "string",
-            "default": "15",
+            "default": "17",
             "description": "The postgres client version to be installed"
         }
     }
diff --git a/features/src/postgres-client/install.sh b/features/src/postgres-client/install.sh
index d69239d..6754f05 100755
--- a/features/src/postgres-client/install.sh
+++ b/features/src/postgres-client/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-export POSTGRES_CLIENT_VERSION="${VERSION:-"15"}"
+export POSTGRES_CLIENT_VERSION="${VERSION:-"17"}"
 
 apt-get update -qq
 

From f3a25e2c5cf311b3af8137c84a7059886dcdb7e8 Mon Sep 17 00:00:00 2001
From: Lars Greiving <lars.greiving@finstreet.de>
Date: Tue, 5 May 2026 14:30:45 +0200
Subject: [PATCH 2/2] Update postgres-client feature tests to account for
 version bump

---
 features/test/postgres-client/scenarios.json              | 8 ++++----
 features/test/postgres-client/test.sh                     | 2 +-
 .../test/postgres-client/{version_14.sh => version_18.sh} | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename features/test/postgres-client/{version_14.sh => version_18.sh} (72%)

diff --git a/features/test/postgres-client/scenarios.json b/features/test/postgres-client/scenarios.json
index e72a2bc..6510311 100644
--- a/features/test/postgres-client/scenarios.json
+++ b/features/test/postgres-client/scenarios.json
@@ -1,17 +1,17 @@
 {
-  "version_16": {
+  "version_18": {
       "image": "mcr.microsoft.com/devcontainers/base:2-trixie",
       "features": {
           "postgres-client": {
-            "version": "16"
+            "version": "18"
           }
       }
   },
-  "version_14": {
+  "version_16": {
     "image": "mcr.microsoft.com/devcontainers/base:2-trixie",
     "features": {
       "postgres-client": {
-        "version": "14"
+        "version": "16"
       }
     }
   }
diff --git a/features/test/postgres-client/test.sh b/features/test/postgres-client/test.sh
index 656350f..b94ca61 100755
--- a/features/test/postgres-client/test.sh
+++ b/features/test/postgres-client/test.sh
@@ -5,7 +5,7 @@ set -e
 source dev-container-features-test-lib
 
 check "PostgreSQL client is installed" bash -c "psql --version"
-check "PostgreSQL version is 15" bash -c "psql --version | grep -q 'psql (PostgreSQL) 15'"
+check "PostgreSQL version is 17" bash -c "psql --version | grep -q 'psql (PostgreSQL) 17'"
 check "libpq-dev is installed" bash -c "dpkg -l | grep libpq-dev"
 
 reportResults
diff --git a/features/test/postgres-client/version_14.sh b/features/test/postgres-client/version_18.sh
similarity index 72%
rename from features/test/postgres-client/version_14.sh
rename to features/test/postgres-client/version_18.sh
index eddb14c..41a8355 100755
--- a/features/test/postgres-client/version_14.sh
+++ b/features/test/postgres-client/version_18.sh
@@ -5,7 +5,7 @@ set -e
 source dev-container-features-test-lib
 
 check "PostgreSQL client is installed" bash -c "psql --version"
-check "PostgreSQL version is 14" bash -c "psql --version | grep -q 'psql (PostgreSQL) 14'"
+check "PostgreSQL version is 18" bash -c "psql --version | grep -q 'psql (PostgreSQL) 18'"
 check "libpq-dev is installed" bash -c "dpkg -l | grep libpq-dev"
 
 reportResults