tianon · mbezuidenhout · Jul 16, 2025 · Jul 16, 2025
diff --git a/13-to-14/Dockerfile b/13-to-14/Dockerfile
diff --git a/13-to-14/docker-upgrade b/13-to-14/docker-upgrade
diff --git a/13-to-15/Dockerfile b/13-to-15/Dockerfile
diff --git a/13-to-15/docker-upgrade b/13-to-15/docker-upgrade
diff --git a/13-to-16/Dockerfile b/13-to-16/Dockerfile
diff --git a/13-to-16/docker-upgrade b/13-to-16/docker-upgrade
diff --git a/13-to-17/Dockerfile b/13-to-17/Dockerfile
diff --git a/13-to-17/docker-upgrade b/13-to-17/docker-upgrade
diff --git a/14-to-15/Dockerfile b/14-to-15/Dockerfile
diff --git a/14-to-15/docker-upgrade b/14-to-15/docker-upgrade
diff --git a/14-to-16/Dockerfile b/14-to-16/Dockerfile
diff --git a/14-to-16/docker-upgrade b/14-to-16/docker-upgrade
diff --git a/14-to-17/Dockerfile b/14-to-17/Dockerfile
diff --git a/14-to-17/docker-upgrade b/14-to-17/docker-upgrade
diff --git a/15-to-16/Dockerfile b/15-to-16/Dockerfile
diff --git a/15-to-16/docker-upgrade b/15-to-16/docker-upgrade
diff --git a/15-to-17/Dockerfile b/15-to-17/Dockerfile
diff --git a/15-to-17/docker-upgrade b/15-to-17/docker-upgrade
diff --git a/16-to-17/Dockerfile b/16-to-17/Dockerfile
diff --git a/16-to-17/docker-upgrade b/16-to-17/docker-upgrade
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -9,11 +9,11 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*
 
-ENV PGBINOLD /usr/lib/postgresql/{{ .old }}/bin
-ENV PGBINNEW /usr/lib/postgresql/{{ .new }}/bin
+ENV PGBINOLD=/usr/lib/postgresql/{{ .old }}/bin
+ENV PGBINNEW=/usr/lib/postgresql/{{ .new }}/bin
 
-ENV PGDATAOLD /var/lib/postgresql/{{ .old }}/data
-ENV PGDATANEW /var/lib/postgresql/{{ .new }}/data
+ENV PGDATAOLD=/var/lib/postgresql/{{ .old }}/data
+ENV PGDATANEW=/var/lib/postgresql/{{ .new }}/data
 
 RUN set -eux; \
 	mkdir -p "$PGDATAOLD" "$PGDATANEW"; \

diff --git a/docker-upgrade b/docker-upgrade
@@ -13,6 +13,10 @@ if [ "$1" = 'pg_upgrade' -a "$(id -u)" = '0' ]; then
 	exec gosu postgres "$BASH_SOURCE" "$@"
 fi
 
+if [[ -n "$PGUSER" && ! "$POSTGRES_INITDB_ARGS" =~ ((--username=|-U[[:space:]])) ]]; then
+    POSTGRES_INITDB_ARGS+=" --username=$PGUSER"
+fi
+
 if [ "$1" = 'pg_upgrade' ]; then
 	if [ ! -s "$PGDATANEW/PG_VERSION" ]; then
 		PGDATA="$PGDATANEW" eval "initdb $POSTGRES_INITDB_ARGS"