Skip to content

Commit 149790c

Browse files
tbeadletbeadle
committed
Update base image in prep for WAL log shipping image.
1 parent 8394b42 commit 149790c

12 files changed

+77
-23
lines changed

‎9.2/alpine/docker-entrypoint.sh

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,14 @@ if [ "${1:0:1}" = '-' ]; then
3838
fi
3939

4040
if [ "$1" = 'postgres' ]; then
41+
for x in /docker-pre-builtin.d/*; do
42+
if [ -f "${x}" -a -x "${x}" ]; then
43+
echo "-----> Running ${x}"
44+
"${x}"
45+
fi
46+
done
4147
for x in /docker-pre-entrypoint.d/*; do
42-
if [ -x "${x}" ]; then
48+
if [ -f "${x}" -a -x "${x}" ]; then
4349
echo "-----> Running ${x}"
4450
"${x}"
4551
fi
@@ -141,6 +147,12 @@ EOF
141147
fi
142148

143149
echo
150+
for x in /docker-builtin-initdb.d/*; do
151+
if [ -f "${x}" -a -x "${x}" ]; then
152+
echo "-----> Running ${x}"
153+
"${x}"
154+
fi
155+
done
144156
for f in /docker-entrypoint-initdb.d/*; do
145157
case "$f" in
146158
*.sh) echo "$0: running $f"; . "$f" ;;
@@ -158,8 +170,14 @@ EOF
158170
echo
159171
fi
160172

173+
for x in /docker-post-builtin.d/*; do
174+
if [ -f "${x}" -a -x "${x}" ]; then
175+
echo "-----> Running ${x}"
176+
"${x}"
177+
fi
178+
done
161179
for x in /docker-post-entrypoint.d/*; do
162-
if [ -x "${x}" ]; then
180+
if [ -f "${x}" -a -x "${x}" ]; then
163181
echo "-----> Running ${x}"
164182
"${x}"
165183
fi

‎9.2/docker-entrypoint.sh

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,14 @@ if [ "${1:0:1}" = '-' ]; then
3838
fi
3939

4040
if [ "$1" = 'postgres' ]; then
41+
for x in /docker-pre-builtin.d/*; do
42+
if [ -f "${x}" -a -x "${x}" ]; then
43+
echo "-----> Running ${x}"
44+
"${x}"
45+
fi
46+
done
4147
for x in /docker-pre-entrypoint.d/*; do
42-
if [ -x "${x}" ]; then
48+
if [ -f "${x}" -a -x "${x}" ]; then
4349
echo "-----> Running ${x}"
4450
"${x}"
4551
fi
@@ -141,6 +147,12 @@ EOF
141147
fi
142148

143149
echo
150+
for x in /docker-builtin-initdb.d/*; do
151+
if [ -f "${x}" -a -x "${x}" ]; then
152+
echo "-----> Running ${x}"
153+
"${x}"
154+
fi
155+
done
144156
for f in /docker-entrypoint-initdb.d/*; do
145157
case "$f" in
146158
*.sh) echo "$0: running $f"; . "$f" ;;
@@ -158,8 +170,14 @@ EOF
158170
echo
159171
fi
160172

173+
for x in /docker-post-builtin.d/*; do
174+
if [ -f "${x}" -a -x "${x}" ]; then
175+
echo "-----> Running ${x}"
176+
"${x}"
177+
fi
178+
done
161179
for x in /docker-post-entrypoint.d/*; do
162-
if [ -x "${x}" ]; then
180+
if [ -f "${x}" -a -x "${x}" ]; then
163181
echo "-----> Running ${x}"
164182
"${x}"
165183
fi

‎9.3/alpine/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fi
3939

4040
if [ "$1" = 'postgres' ]; then
4141
for x in /docker-pre-entrypoint.d/*; do
42-
if [ -x "${x}" ]; then
42+
if [ -f "${x}" -a -x "${x}" ]; then
4343
echo "-----> Running ${x}"
4444
"${x}"
4545
fi
@@ -159,7 +159,7 @@ EOF
159159
fi
160160

161161
for x in /docker-post-entrypoint.d/*; do
162-
if [ -x "${x}" ]; then
162+
if [ -f "${x}" -a -x "${x}" ]; then
163163
echo "-----> Running ${x}"
164164
"${x}"
165165
fi

‎9.3/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fi
3939

4040
if [ "$1" = 'postgres' ]; then
4141
for x in /docker-pre-entrypoint.d/*; do
42-
if [ -x "${x}" ]; then
42+
if [ -f "${x}" -a -x "${x}" ]; then
4343
echo "-----> Running ${x}"
4444
"${x}"
4545
fi
@@ -159,7 +159,7 @@ EOF
159159
fi
160160

161161
for x in /docker-post-entrypoint.d/*; do
162-
if [ -x "${x}" ]; then
162+
if [ -f "${x}" -a -x "${x}" ]; then
163163
echo "-----> Running ${x}"
164164
"${x}"
165165
fi

‎9.4/alpine/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fi
3939

4040
if [ "$1" = 'postgres' ]; then
4141
for x in /docker-pre-entrypoint.d/*; do
42-
if [ -x "${x}" ]; then
42+
if [ -f "${x}" -a -x "${x}" ]; then
4343
echo "-----> Running ${x}"
4444
"${x}"
4545
fi
@@ -159,7 +159,7 @@ EOF
159159
fi
160160

161161
for x in /docker-post-entrypoint.d/*; do
162-
if [ -x "${x}" ]; then
162+
if [ -f "${x}" -a -x "${x}" ]; then
163163
echo "-----> Running ${x}"
164164
"${x}"
165165
fi

‎9.4/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fi
3939

4040
if [ "$1" = 'postgres' ]; then
4141
for x in /docker-pre-entrypoint.d/*; do
42-
if [ -x "${x}" ]; then
42+
if [ -f "${x}" -a -x "${x}" ]; then
4343
echo "-----> Running ${x}"
4444
"${x}"
4545
fi
@@ -159,7 +159,7 @@ EOF
159159
fi
160160

161161
for x in /docker-post-entrypoint.d/*; do
162-
if [ -x "${x}" ]; then
162+
if [ -f "${x}" -a -x "${x}" ]; then
163163
echo "-----> Running ${x}"
164164
"${x}"
165165
fi

‎9.5/alpine/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fi
3939

4040
if [ "$1" = 'postgres' ]; then
4141
for x in /docker-pre-entrypoint.d/*; do
42-
if [ -x "${x}" ]; then
42+
if [ -f "${x}" -a -x "${x}" ]; then
4343
echo "-----> Running ${x}"
4444
"${x}"
4545
fi
@@ -159,7 +159,7 @@ EOF
159159
fi
160160

161161
for x in /docker-post-entrypoint.d/*; do
162-
if [ -x "${x}" ]; then
162+
if [ -f "${x}" -a -x "${x}" ]; then
163163
echo "-----> Running ${x}"
164164
"${x}"
165165
fi

‎9.5/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fi
3939

4040
if [ "$1" = 'postgres' ]; then
4141
for x in /docker-pre-entrypoint.d/*; do
42-
if [ -x "${x}" ]; then
42+
if [ -f "${x}" -a -x "${x}" ]; then
4343
echo "-----> Running ${x}"
4444
"${x}"
4545
fi
@@ -159,7 +159,7 @@ EOF
159159
fi
160160

161161
for x in /docker-post-entrypoint.d/*; do
162-
if [ -x "${x}" ]; then
162+
if [ -f "${x}" -a -x "${x}" ]; then
163163
echo "-----> Running ${x}"
164164
"${x}"
165165
fi

‎9.6/alpine/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fi
3939

4040
if [ "$1" = 'postgres' ]; then
4141
for x in /docker-pre-entrypoint.d/*; do
42-
if [ -x "${x}" ]; then
42+
if [ -f "${x}" -a -x "${x}" ]; then
4343
echo "-----> Running ${x}"
4444
"${x}"
4545
fi
@@ -159,7 +159,7 @@ EOF
159159
fi
160160

161161
for x in /docker-post-entrypoint.d/*; do
162-
if [ -x "${x}" ]; then
162+
if [ -f "${x}" -a -x "${x}" ]; then
163163
echo "-----> Running ${x}"
164164
"${x}"
165165
fi

‎9.6/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fi
3939

4040
if [ "$1" = 'postgres' ]; then
4141
for x in /docker-pre-entrypoint.d/*; do
42-
if [ -x "${x}" ]; then
42+
if [ -f "${x}" -a -x "${x}" ]; then
4343
echo "-----> Running ${x}"
4444
"${x}"
4545
fi
@@ -159,7 +159,7 @@ EOF
159159
fi
160160

161161
for x in /docker-post-entrypoint.d/*; do
162-
if [ -x "${x}" ]; then
162+
if [ -f "${x}" -a -x "${x}" ]; then
163163
echo "-----> Running ${x}"
164164
"${x}"
165165
fi

‎docker-entrypoint.sh

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,14 @@ if [ "${1:0:1}" = '-' ]; then
3838
fi
3939

4040
if [ "$1" = 'postgres' ]; then
41+
for x in /docker-pre-builtin.d/*; do
42+
if [ -f "${x}" -a -x "${x}" ]; then
43+
echo "-----> Running ${x}"
44+
"${x}"
45+
fi
46+
done
4147
for x in /docker-pre-entrypoint.d/*; do
42-
if [ -x "${x}" ]; then
48+
if [ -f "${x}" -a -x "${x}" ]; then
4349
echo "-----> Running ${x}"
4450
"${x}"
4551
fi
@@ -141,6 +147,12 @@ EOF
141147
fi
142148

143149
echo
150+
for x in /docker-builtin-initdb.d/*; do
151+
if [ -f "${x}" -a -x "${x}" ]; then
152+
echo "-----> Running ${x}"
153+
"${x}"
154+
fi
155+
done
144156
for f in /docker-entrypoint-initdb.d/*; do
145157
case "$f" in
146158
*.sh) echo "$0: running $f"; . "$f" ;;
@@ -158,8 +170,14 @@ EOF
158170
echo
159171
fi
160172

173+
for x in /docker-post-builtin.d/*; do
174+
if [ -f "${x}" -a -x "${x}" ]; then
175+
echo "-----> Running ${x}"
176+
"${x}"
177+
fi
178+
done
161179
for x in /docker-post-entrypoint.d/*; do
162-
if [ -x "${x}" ]; then
180+
if [ -f "${x}" -a -x "${x}" ]; then
163181
echo "-----> Running ${x}"
164182
"${x}"
165183
fi

‎update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
55

66
versions=( "$@" )
77
if [ ${#versions[@]} -eq 0 ]; then
8-
versions=( */ )
8+
versions=( [0-9]*/ )
99
fi
1010
versions=( "${versions[@]%/}" )
1111

0 commit comments

Comments
 (0)