File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -6,8 +6,8 @@ FROM ghcr.io/linuxserver/baseimage-alpine:${LSIO_BASE_VERSION}
66ARG LSIO_BASE_VERSION
77ARG BUILD_DATE
88ARG APP_VERSION=16.14
9- ARG IMAGE_REVISION=mldm1
10- ARG VERSION=16.14-mldm1
9+ ARG IMAGE_REVISION=mldm2
10+ ARG VERSION=16.14-mldm2
1111ARG VCS_REF
1212
1313LABEL build_version="Mildman1848 PostgreSQL version:- ${VERSION} Upstream:- ${APP_VERSION} Revision:- ${IMAGE_REVISION} Build-date:- ${BUILD_DATE}" \
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ SHELL := /usr/bin/env bash
33
44IMAGE_NAME ?= postgresql
55APP_VERSION ?= 16.14
6- IMAGE_REVISION ?= mldm1
6+ IMAGE_REVISION ?= mldm2
77VERSION ?= $(APP_VERSION ) -$(IMAGE_REVISION )
88IMAGE_TAG ?= $(VERSION )
99REGISTRY ?= ghcr.io/mildman1848
Original file line number Diff line number Diff line change @@ -12,10 +12,18 @@ sql_escape() {
1212 printf " %s" " ${value// \' / \'\' } "
1313}
1414
15- mkdir -p " $PGDATA " /run/postgresql
15+ mkdir -p " $( dirname " $ PGDATA" ) " /run/postgresql
1616chown -R abc:abc /config /run/postgresql
1717
1818if [[ ! -s " $PGDATA /PG_VERSION" ]]; then
19+ if [[ -d " $PGDATA " ]] && find " $PGDATA " -mindepth 1 -maxdepth 1 | grep -q . ; then
20+ failed_dir=" ${PGDATA} .failed-init.$( date -u +%Y%m%d%H%M%S) "
21+ echo " Warning: $PGDATA exists but has no PG_VERSION; moving partial init to $failed_dir " >&2
22+ mv " $PGDATA " " $failed_dir "
23+ fi
24+
25+ mkdir -p " $PGDATA "
26+ chown -R abc:abc " $PGDATA "
1927 echo " Initializing PostgreSQL data directory at $PGDATA "
2028 s6-setuidgid abc initdb -D " $PGDATA " --username=" $POSTGRES_USER "
2129
You can’t perform that action at this time.
0 commit comments