Skip to content

Commit 576a9df

Browse files
committed
fix: use tini as PID 1 from the start
This seems better practice and ensures safer shutdown if the container is killed while entrypoint scripts are running
1 parent fc203de commit 576a9df

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

buildSrc/src/main/resources/gocd-docker-agent/Dockerfile.agent.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,6 @@ VOLUME /godata
101101
COPY --chown=root:root run-docker-daemon.sh /
102102
</#if>
103103

104-
ENTRYPOINT ["/docker-entrypoint.sh"]
104+
ENTRYPOINT ["tini-static", "-g", "--", "/docker-entrypoint.sh"]
105105

106106
USER go

buildSrc/src/main/resources/gocd-docker-agent/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,4 @@ if [ "$1" = "${AGENT_WORK_DIR}/bin/go-agent" ]; then
170170
echo "set.AGENT_STARTUP_ARGS=%AGENT_STARTUP_ARGS_INTERNAL%" >> /go-agent/wrapper-config/wrapper-properties.conf
171171
fi
172172

173-
try exec tini-static -g -- "$@"
173+
try exec "$@"

buildSrc/src/main/resources/gocd-docker-server/Dockerfile.server.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,6 @@ RUN chown -R go:root /docker-entrypoint.d /go-working-dir /godata /docker-entryp
9292
VOLUME /go-working-dir
9393
VOLUME /godata
9494

95-
ENTRYPOINT ["/docker-entrypoint.sh"]
95+
ENTRYPOINT ["tini-static", "-g", "--", "/docker-entrypoint.sh"]
9696

9797
USER go

buildSrc/src/main/resources/gocd-docker-server/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,4 @@ if [ "$1" = "${SERVER_WORK_DIR}/bin/go-server" ]; then
102102
done
103103
fi
104104

105-
try exec tini-static -g -- "$@"
105+
try exec "$@"

0 commit comments

Comments
 (0)