Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion features/src/postgres-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions features/src/postgres-client/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"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",
"licenseURL": "https://github.com/rails/devcontainer/blob/main/LICENSE.md",
"options": {
"version": {
"type": "string",
"default": "15",
"default": "17",
"description": "The postgres client version to be installed"
}
}
Expand Down
2 changes: 1 addition & 1 deletion features/src/postgres-client/install.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
set -e

export POSTGRES_CLIENT_VERSION="${VERSION:-"15"}"
export POSTGRES_CLIENT_VERSION="${VERSION:-"17"}"

apt-get update -qq

Expand Down
8 changes: 4 additions & 4 deletions features/test/postgres-client/scenarios.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion features/test/postgres-client/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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