feat(docker): upgrade psql to 18 (#593)

* feat: upgrade psql to 18

Instead of relying on the one packaged for the version of the ubuntu image being used.
This is good for a few reasons:
* pins the version of psql so it can be controlled
* upgrades from 16 to 18 to resolve a few issues and unlock others

* use env var for postgres version

* leave curl in the image

Author: mscrivo

Dockerfile

@@ -20,10 +20,18 @@ RUN source ~/.cargo/env && \
 
 FROM ubuntu:latest
 ENV RUST_LOG=info
+ENV PSQL_VERSION=18
 RUN apt update && \
-    apt install -y ca-certificates postgresql-client ssl-cert && \
+    apt install -y curl ca-certificates ssl-cert && \
     update-ca-certificates
 
+RUN install -d /usr/share/postgresql-common/pgdg && \
+    curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc && \
+    . /etc/os-release && \
+    sh -c "echo 'deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $VERSION_CODENAME-pgdg main' > /etc/apt/sources.list.d/pgdg.list"
+
+RUN apt update && apt install -y postgresql-client-${PSQL_VERSION}
+
 COPY --from=builder /build/target/release/pgdog /usr/local/bin/pgdog
 
 WORKDIR /pgdog

docker-compose.yml

@@ -11,23 +11,23 @@ services:
     environment:
       RUST_LOG: debug
   shard_0:
-    image: postgres:17
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
     volumes:
       - ./docker/setup.sql:/docker-entrypoint-initdb.d/setup.sql
     networks:
       - postgres
   shard_1:
-    image: postgres:17
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
     networks:
       - postgres
     volumes:
       - ./docker/setup.sql:/docker-entrypoint-initdb.d/setup.sql
   shard_2:
-    image: postgres:17
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
     networks:

examples/demo/docker-compose.yml

@@ -1,22 +1,22 @@
 services:
   db_0:
-    image: postgres:16
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
     ports:
       - 6000:5432
     volumes:
       - shard_0:/var/lib/postgresql/data
   db_1:
-    image: postgres:16
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
     ports:
       - 6001:5432
     volumes:
       - shard_1:/var/lib/postgresql/data
   db_2:
-    image: postgres:16
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
     ports:

examples/multi_tenant/docker-compose.yml

@@ -1,22 +1,22 @@
 services:
   shard_0:
-    image: postgres:17
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
     ports:
       - 6000:5432
     volumes:
       - shard_0:/var/lib/postgresql/data
   shard_1:
-    image: postgres:17
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
     ports:
       - 6001:5432
     volumes:
       - shard_1:/var/lib/postgresql/data
   shard_2:
-    image: postgres:17
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
     ports:

examples/pgbouncer_benchmark/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   postgres:
-    image: postgres:17
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
   pgbouncer:

integration/load_balancer/docker-compose.yml

@@ -1,14 +1,14 @@
 services:
   primary:
-    image: postgres:17
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
     volumes:
       - ./docker/primary.sh:/docker-entrypoint-initdb.d/setup.sh
     ports:
       - 45000:5432
   replica_1:
-    image: postgres:17
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
     volumes:
@@ -20,7 +20,7 @@ services:
     ports:
       - 45001:5432
   replica_2:
-    image: postgres:17
+    image: postgres:18
     environment:
       POSTGRES_PASSWORD: postgres
     volumes: