Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ COPY --from=builder /usr/src/openas2/Runtime/resources ${OPENAS2_BASE}/resources
COPY --from=builder /usr/src/openas2/Runtime/config_template ${OPENAS2_HOME}/config_template
RUN mkdir ${OPENAS2_BASE}/config
WORKDIR $OPENAS2_HOME
ENTRYPOINT ${OPENAS2_BASE}/bin/start-container.sh
ENTRYPOINT ["/opt/openas2/bin/start-container.sh"]
5 changes: 3 additions & 2 deletions Server/src/bin/start-openas2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ if [ "true" = "$OPENAS2_AS_DAEMON" ]; then
echo $PID > $OPENAS2_PID
fi
else
${CMD}
RETVAL="$?"
# Replace the shell with the java process so it receives signals directly
# (required for clean shutdown when running as PID 1 in a container)
exec ${CMD}
fi
exit $RETVAL
4 changes: 2 additions & 2 deletions start-container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ if [ ! -e $OPENAS2_PROPERTIES_FILE ]
done

fi
# Start OpenAS2 in foreground
$(dirname $0)/start-openas2.sh
# Start OpenAS2 in foreground, replacing this shell so signals reach the JVM
exec $(dirname $0)/start-openas2.sh
Loading