Skip to content

Commit e182f47

Browse files
tianontianon
committed
Update order to match other blocks and add additional "file_env" so that it works regardless of invocation order
1 parent 89530f6 commit e182f47

11 files changed

+33
-11
lines changed

‎9.2/alpine/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
4141
file_env 'POSTGRES_INITDB_XLOGDIR'
4242
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
4343
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
44-
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
4544
chown -R postgres "$POSTGRES_INITDB_XLOGDIR"
45+
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
46+
47+
file_env 'POSTGRES_INITDB_ARGS'
4648
export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
4749
fi
4850

‎9.2/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
4141
file_env 'POSTGRES_INITDB_XLOGDIR'
4242
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
4343
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
44-
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
4544
chown -R postgres "$POSTGRES_INITDB_XLOGDIR"
45+
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
46+
47+
file_env 'POSTGRES_INITDB_ARGS'
4648
export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
4749
fi
4850

‎9.3/alpine/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
4141
file_env 'POSTGRES_INITDB_XLOGDIR'
4242
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
4343
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
44-
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
4544
chown -R postgres "$POSTGRES_INITDB_XLOGDIR"
45+
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
46+
47+
file_env 'POSTGRES_INITDB_ARGS'
4648
export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
4749
fi
4850

‎9.3/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
4141
file_env 'POSTGRES_INITDB_XLOGDIR'
4242
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
4343
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
44-
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
4544
chown -R postgres "$POSTGRES_INITDB_XLOGDIR"
45+
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
46+
47+
file_env 'POSTGRES_INITDB_ARGS'
4648
export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
4749
fi
4850

‎9.4/alpine/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
4141
file_env 'POSTGRES_INITDB_XLOGDIR'
4242
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
4343
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
44-
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
4544
chown -R postgres "$POSTGRES_INITDB_XLOGDIR"
45+
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
46+
47+
file_env 'POSTGRES_INITDB_ARGS'
4648
export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
4749
fi
4850

‎9.4/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
4141
file_env 'POSTGRES_INITDB_XLOGDIR'
4242
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
4343
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
44-
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
4544
chown -R postgres "$POSTGRES_INITDB_XLOGDIR"
45+
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
46+
47+
file_env 'POSTGRES_INITDB_ARGS'
4648
export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
4749
fi
4850

‎9.5/alpine/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
4141
file_env 'POSTGRES_INITDB_XLOGDIR'
4242
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
4343
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
44-
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
4544
chown -R postgres "$POSTGRES_INITDB_XLOGDIR"
45+
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
46+
47+
file_env 'POSTGRES_INITDB_ARGS'
4648
export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
4749
fi
4850

‎9.5/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
4141
file_env 'POSTGRES_INITDB_XLOGDIR'
4242
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
4343
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
44-
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
4544
chown -R postgres "$POSTGRES_INITDB_XLOGDIR"
45+
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
46+
47+
file_env 'POSTGRES_INITDB_ARGS'
4648
export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
4749
fi
4850

‎9.6/alpine/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
4141
file_env 'POSTGRES_INITDB_XLOGDIR'
4242
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
4343
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
44-
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
4544
chown -R postgres "$POSTGRES_INITDB_XLOGDIR"
45+
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
46+
47+
file_env 'POSTGRES_INITDB_ARGS'
4648
export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
4749
fi
4850

‎9.6/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
4141
file_env 'POSTGRES_INITDB_XLOGDIR'
4242
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
4343
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
44-
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
4544
chown -R postgres "$POSTGRES_INITDB_XLOGDIR"
45+
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
46+
47+
file_env 'POSTGRES_INITDB_ARGS'
4648
export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
4749
fi
4850

‎docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
4141
file_env 'POSTGRES_INITDB_XLOGDIR'
4242
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
4343
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
44-
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
4544
chown -R postgres "$POSTGRES_INITDB_XLOGDIR"
45+
chmod 700 "$POSTGRES_INITDB_XLOGDIR"
46+
47+
file_env 'POSTGRES_INITDB_ARGS'
4648
export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
4749
fi
4850

0 commit comments

Comments
 (0)