diff --git a/examples/stacks/lepp-stack/devbox.json b/examples/stacks/lepp-stack/devbox.json index e97fbd53718..f98cb0a5e70 100644 --- a/examples/stacks/lepp-stack/devbox.json +++ b/examples/stacks/lepp-stack/devbox.json @@ -25,7 +25,7 @@ "rm -rf .devbox/virtenv/postgresql/data", "initdb", "devbox services up -b", - "echo 'sleep 2 second for the postgres server to initialize.' && sleep 2", + "echo 'sleep 2 seconds for the postgres server to initialize.' && sleep 2", "dropdb --if-exists devbox_lepp", "createdb devbox_lepp", "psql devbox_lepp < setup_postgres_db.sql", diff --git a/internal/devbox/devbox.go b/internal/devbox/devbox.go index d65ba219352..bd2087f1b01 100644 --- a/internal/devbox/devbox.go +++ b/internal/devbox/devbox.go @@ -52,9 +52,8 @@ import ( const ( // shellHistoryFile keeps the history of commands invoked inside devbox shell - shellHistoryFile = ".devbox/shell_history" - processComposeTargetVersion = "v1.5.0" - arbitraryCmdFilename = ".cmd" + shellHistoryFile = ".devbox/shell_history" + arbitraryCmdFilename = ".cmd" ) type Devbox struct { diff --git a/internal/devbox/util.go b/internal/devbox/util.go index 28523f5cb5f..9ae5ebf8e4b 100644 --- a/internal/devbox/util.go +++ b/internal/devbox/util.go @@ -16,7 +16,7 @@ import ( "go.jetify.com/devbox/internal/xdg" ) -const processComposeVersion = "1.64.1" +const processComposeVersion = "1.87.0" var utilProjectConfigPath string diff --git a/plugins/postgresql/process-compose.yaml b/plugins/postgresql/process-compose.yaml index 6070883919b..6241d3baec8 100644 --- a/plugins/postgresql/process-compose.yaml +++ b/plugins/postgresql/process-compose.yaml @@ -2,12 +2,12 @@ version: "0.5" processes: postgresql: - command: "pg_ctl start -o \"-k '$PGHOST' ${PGPORT:+-p '$PGPORT'}\"" - is_daemon: true - shutdown: + command: "sh -c 'exec postgres -k \"$PGHOST\" -p \"${PGPORT:-5432}\"'" + is_daemon: false + shutdown: command: "pg_ctl stop -m fast" availability: restart: "always" readiness_probe: exec: - command: "pg_isready ${PGPORT:+-p '$PGPORT'}" + command: "pg_isready -p \"${PGPORT:-5432}\"" diff --git a/testscripts/add/add_platforms_flakeref.test.txt b/testscripts/add/add_platforms_flakeref.test.txt index f58df62d9ee..37ce32d8970 100644 --- a/testscripts/add/add_platforms_flakeref.test.txt +++ b/testscripts/add/add_platforms_flakeref.test.txt @@ -4,12 +4,12 @@ exec devbox install # aside: choose armv7l-linux to verify that the add actually works on the # current host that is unlikely to be armv7l-linux -exec devbox add github:F1bonacc1/process-compose/v0.40.2 --exclude-platform armv7l-linux +exec devbox add github:F1bonacc1/process-compose/v1.87.0 --exclude-platform armv7l-linux json.superset devbox.json expected_devbox1.json # verify that the package is installed on this platform exec devbox run -- process-compose version -stdout '0.40.2' +stdout '1.87.0' -- devbox.json -- { @@ -24,7 +24,7 @@ stdout '0.40.2' "packages": { "hello": "", "cowsay": "latest", - "github:F1bonacc1/process-compose/v0.40.2": { + "github:F1bonacc1/process-compose/v1.87.0": { "excluded_platforms": ["armv7l-linux"] } }