File tree Expand file tree Collapse file tree 3 files changed +11
-4
lines changed Expand file tree Collapse file tree 3 files changed +11
-4
lines changed Original file line number Diff line number Diff line change 4
4
push :
5
5
branches :
6
6
- develop
7
+ - pcnc/fix-aio-signal-handling
7
8
paths :
8
9
- " .github/workflows/dockerhub-release-aio.yml"
9
10
- " docker/all-in-one/*"
Original file line number Diff line number Diff line change @@ -146,6 +146,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
146
146
less \
147
147
libnuma1 \
148
148
logrotate \
149
+ dumb-init \
149
150
# pg_egress_collect deps
150
151
tcpdump libio-async-perl \
151
152
&& rm -rf /var/lib/apt/lists/* /tmp/* \
@@ -283,4 +284,6 @@ COPY docker/all-in-one/postgres-entrypoint.sh /usr/local/bin/
283
284
COPY docker/all-in-one/shutdown.sh /usr/local/bin/supa-shutdown.sh
284
285
COPY docker/all-in-one/run-logrotate.sh /usr/local/bin/run-logrotate.sh
285
286
286
- ENTRYPOINT [ "entrypoint.sh" ]
287
+ ENTRYPOINT [ "/usr/bin/dumb-init" ]
288
+
289
+ CMD [ "entrypoint.sh" ]
Original file line number Diff line number Diff line change @@ -63,14 +63,11 @@ function push_lsn_checkpoint_file {
63
63
64
64
function graceful_shutdown {
65
65
echo " $( date) : Received SIGINT. Shutting down."
66
- supervisorctl stop postgresql
67
66
68
67
# Postgres ships the latest WAL file using archive_command during shutdown, in a blocking operation
69
68
# This is to ensure that the WAL file is shipped, just in case
70
69
sleep 0.2
71
70
push_lsn_checkpoint_file
72
-
73
- kill -s TERM " $( supervisorctl pid) "
74
71
}
75
72
76
73
function enable_autoshutdown {
@@ -188,6 +185,12 @@ function start_supervisor {
188
185
189
186
# Start supervisord
190
187
/usr/bin/supervisord -c $SUPERVISOR_CONF
188
+
189
+ # SUPERVISORD_PID=$(supervisorctl pid)
190
+
191
+ # while [ -e "/proc/$SUPERVISORD_PID" ]; do
192
+ # sleep 5
193
+ # done
191
194
}
192
195
193
196
# Increase max number of open connections
You can’t perform that action at this time.
0 commit comments