fix: address pr #2054 review comments.

Author: samrose

Dockerfile-multigres

@@ -6,9 +6,9 @@
 #   docker build -f Dockerfile-multigres --target variant-orioledb-17 -t multigres-orioledb-17 .
 
 ####################
-# Stage 1a: Nix builder — PostgreSQL 17
+# Stage 0: Nix base — shared Alpine + Nix setup for all builders
 ####################
-FROM alpine:3.21 AS nix-builder-17
+FROM alpine:3.21 AS nix-base
 
 RUN apk add --no-cache \
     bash \
@@ -35,6 +35,11 @@ ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin"
 WORKDIR /nixpg
 COPY . .
 
+####################
+# Stage 1a: Nix builder — PostgreSQL 17
+####################
+FROM nix-base AS nix-builder-17
+
 RUN nix profile add path:.#psql_17_slim/bin path:.#pg-backrest path:.#pgctld
 
 RUN nix store gc
@@ -48,32 +53,7 @@ RUN nix store gc
 ####################
 # Stage 1b: Nix builder — OrioleDB 17
 ####################
-FROM alpine:3.21 AS nix-builder-orioledb-17
-
-RUN apk add --no-cache \
-    bash \
-    coreutils \
-    curl \
-    shadow \
-    sudo \
-    xz
-
-RUN addgroup -S postgres && \
-    adduser -S -h /var/lib/postgresql -s /bin/bash -G postgres postgres && \
-    addgroup -S wal-g && \
-    adduser -S -s /bin/bash -G wal-g wal-g
-
-RUN cat <<EOF > /tmp/extra-nix.conf
-extra-experimental-features = nix-command flakes
-extra-substituters = https://nix-postgres-artifacts.s3.amazonaws.com
-extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=
-EOF
-RUN curl -L https://releases.nixos.org/nix/nix-2.33.2/install | sh -s -- --daemon --no-channel-add --yes --nix-extra-conf-file /tmp/extra-nix.conf
-
-ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin"
-
-WORKDIR /nixpg
-COPY . .
+FROM nix-base AS nix-builder-orioledb-17
 
 RUN nix profile add path:.#psql_orioledb-17_slim/bin path:.#pg-backrest path:.#pgctld
 

docker/pgctld/orioledb-postgresql.conf.tmpl

@@ -221,32 +221,14 @@ row_security = on
 
 timezone = 'UTC'
 
-# These settings are initialized by initdb, but they can be changed.
-lc_messages = 'en_US.UTF-8'			# locale for system error message
-					# strings
-lc_monetary = 'en_US.UTF-8'			# locale for monetary formatting
-lc_numeric = 'en_US.UTF-8'			# locale for number formatting
-lc_time = 'en_US.UTF-8'				# locale for time formatting
-
-# default configuration for text search
-default_text_search_config = 'pg_catalog.english'
-
-# These settings are initialized by initdb, but they can be changed.
-lc_messages = 'en_US.UTF-8'			# locale for system error message
-					# strings
-lc_monetary = 'en_US.UTF-8'			# locale for monetary formatting
-lc_numeric = 'en_US.UTF-8'			# locale for number formatting
-lc_time = 'en_US.UTF-8'				# locale for time formatting
+# Locale settings (lc_messages, lc_monetary, lc_numeric, lc_time) are
+# inherited from the container environment (LANG, LC_ALL).
 
 # default configuration for text search
 default_text_search_config = 'pg_catalog.english'
 
 # - Shared Library Preloading -
 
-## TODO: @rafael - We are starting from a Vanilla postgres. We still
-## ened to do work here to make sure we start postgres with libraries that
-## will be used by supabase infra.
-# shared_preload_libraries = 'pg_stat_statements, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, pgsodium, timescaledb, auto_explain, pg_tle, plan_filter, supabase_vault'	# (change requires restart)
 jit_provider = 'llvmjit'		# JIT library to use
 
 # - Other Defaults -
@@ -272,7 +254,7 @@ jit_provider = 'llvmjit'		# JIT library to use
 #------------------------------------------------------------------------------
 
 #exit_on_error = off			# terminate session on any error?
-#restart_after_crash = on		# reinitialize after backend crash?
+restart_after_crash = off		# reinitialize after backend crash?
 #data_sync_retry = off			# retry or panic on failure to fsync
 					# data?
 					# (change requires restart)
@@ -306,7 +288,7 @@ wal_log_hints = 'on'
 # These settings activate OrioleDB as the default table storage engine.
 # Injected automatically by the /usr/local/bin/pgctld wrapper in variant-orioledb-17.
 #------------------------------------------------------------------------------
-shared_preload_libraries = 'orioledb'
+shared_preload_libraries = 'pg_stat_statements, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, auto_explain, pg_tle, plan_filter, supabase_vault, orioledb'
 default_table_access_method = 'orioledb'
 orioledb.enable_rewind = true
 orioledb.rewind_max_time = 1200

flake.lock

@@ -9,10 +9,7 @@ buildGoModule {
   src = multigres-src;
   subPackages = [ "go/cmd/pgctld" ];
   env.CGO_ENABLED = "0";
-  ldflags = [
-    "-s"
-    "-w"
-  ];
+  ldflags = [ ];
   # The Makefile copies pico CSS assets before go build; pgctld does not use web
   # templates so this is a no-op, but kept for safety in case of future imports.
   preBuild = ''