Skip to content

Commit ad42345

Browse files
Check for exit codes rather than swallow them
Signed-off-by: Miranda Streeter <miranda@mirandastreeter.com>
1 parent cd3a601 commit ad42345

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Containerfile.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ USER puppet:0
109109
# Create a CDS archive in a stage for faster class loading.
110110
FROM app AS cds
111111
RUN OPENVOXSERVER_JAVA_ARGS="-Xms1024m -Xmx1024m -XX:ArchiveClassesAtExit=/opt/puppetlabs/server/apps/puppetserver/puppetserver.jsa" \
112-
timeout 60 dumb-init /container-entrypoint.sh foreground || true
112+
timeout --preserve-status 60 dumb-init /container-entrypoint.sh foreground || [ $? -eq 143 ]
113113

114114
FROM app AS final
115115
COPY --from=cds /opt/puppetlabs/server/apps/puppetserver/puppetserver.jsa /opt/puppetlabs/server/apps/puppetserver/puppetserver.jsa

Containerfile.ubuntu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ USER puppet:0
118118
# Create a CDS archive in a stage for faster class loading.
119119
FROM app AS cds
120120
RUN OPENVOXSERVER_JAVA_ARGS="-Xms1024m -Xmx1024m -XX:ArchiveClassesAtExit=/opt/puppetlabs/server/apps/puppetserver/puppetserver.jsa" \
121-
timeout 60 dumb-init /container-entrypoint.sh foreground || true
121+
timeout --preserve-status 60 dumb-init /container-entrypoint.sh foreground || [ $? -eq 143 ]
122122

123123
FROM app AS final
124124
COPY --from=cds /opt/puppetlabs/server/apps/puppetserver/puppetserver.jsa /opt/puppetlabs/server/apps/puppetserver/puppetserver.jsa

0 commit comments

Comments
 (0)