upgrade pg version, use en flightsdb

Author: fey

Dockerfile

@@ -1,7 +1,13 @@
-FROM postgres:12-alpine
+FROM postgres:17-alpine
 
 WORKDIR /scripts
 
+COPY config/ /etc/postgresql/
+COPY scripts/configure_postgres.sh /docker-entrypoint-initdb.d/00_configure_postgres.sh
+RUN chown postgres:postgres /etc/postgresql/*.conf \
+    && chmod 600 /etc/postgresql/*.conf \
+    && chmod +x /docker-entrypoint-initdb.d/00_configure_postgres.sh
+
 COPY scripts/setup_user.sql /scripts
 
 COPY scripts/salesdb /scripts/salesdb

Makefile

@@ -1,3 +1,5 @@
+COMPOSE ?= docker compose
+
 start:
 	make stop rm || true
 	docker run -it \
@@ -17,3 +19,24 @@ rm:
 
 bash:
 	docker run --rm -it data-salesdb bash
+
+compose-build:
+	$(COMPOSE) build
+
+compose:
+	$(COMPOSE) up --abort-on-container-exit
+
+compose-down:
+	$(COMPOSE) down -v --remove-orphans
+
+compose-logs:
+	$(COMPOSE) logs -f
+
+compose-ps:
+	$(COMPOSE) ps
+
+compose-bash:
+	$(COMPOSE) run --rm postgres bash
+
+compose-attach:
+	$(COMPOSE) exec postgres bash

config/pg_hba.conf

@@ -0,0 +1,10 @@
+# TYPE  DATABASE        USER            ADDRESS                 METHOD
+
+local   all             postgres                                peer
+local   all             all                                     scram-sha-256
+host    all             postgres        0.0.0.0/0               scram-sha-256
+host    all             postgres        ::/0                    scram-sha-256
+host    all             student         0.0.0.0/0               scram-sha-256
+host    all             student         ::/0                    scram-sha-256
+host    all             all             127.0.0.1/32            scram-sha-256
+host    all             all             ::1/128                 scram-sha-256

config/postgresql.conf

@@ -0,0 +1,2 @@
+listen_addresses = '*'
+password_encryption = 'scram-sha-256'

docker-compose.yml

@@ -0,0 +1,19 @@
+services:
+  postgres:
+    build:
+      context: .
+    environment:
+      POSTGRES_PASSWORD: secret
+    ports:
+      - "5432:5432"
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -h 127.0.0.1"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 5s
+
+volumes:
+  pgdata:

scripts/configure_postgres.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+: "${PGDATA:?PGDATA is not set}"
+
+cp /etc/postgresql/postgresql.conf "$PGDATA/postgresql.conf"
+cp /etc/postgresql/pg_hba.conf "$PGDATA/pg_hba.conf"
+chmod 600 "$PGDATA/postgresql.conf" "$PGDATA/pg_hba.conf"

scripts/flightsdb/flightsdb.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8a5ceed973724a7ee842b467f6cc3b107110f98c0e472687f1fd3f9c4469797
-size 12201348
+oid sha256:ac803445153c4f6f325a40bb36647d83c8c8f398701d66aab5b1ab9bfa74e70d
+size 14768668

scripts/setup_user.sql

@@ -1,6 +1,26 @@
-REVOKE ALL ON schema public FROM public;
-CREATE ROLE student WITH LOGIN PASSWORD 'student'
-NOSUPERUSER INHERIT NOCREATEDB NOCREATEROLE NOREPLICATION VALID UNTIL 'infinity';
+DO
+$$
+BEGIN
+    IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'student') THEN
+        CREATE ROLE student
+            WITH LOGIN PASSWORD 'student'
+            NOSUPERUSER INHERIT NOCREATEDB NOCREATEROLE NOREPLICATION;
+    END IF;
+END;
+$$;
+
+REVOKE ALL ON SCHEMA public FROM public;
+
 GRANT USAGE ON SCHEMA public TO student;
 GRANT SELECT ON ALL TABLES IN SCHEMA public TO student;
 ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO student;
+
+DO
+$$
+DECLARE
+    dbname text := current_database();
+BEGIN
+    EXECUTE format('GRANT CONNECT ON DATABASE %I TO student', dbname);
+    EXECUTE format('GRANT TEMP ON DATABASE %I TO student', dbname);
+END;
+$$;