Skip to content
This repository was archived by the owner on Oct 15, 2025. It is now read-only.

Commit af9fd34

Browse files
committed
Use the tini shim in all flavours
I was misled by the error message found in alpine, but the move was actually not specific to alpine.
1 parent c08b3a7 commit af9fd34

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ USER ${user}
7070

7171
COPY jenkins-support /usr/local/bin/jenkins-support
7272
COPY jenkins.sh /usr/local/bin/jenkins.sh
73+
COPY tini-shim.sh /bin/tini
7374
ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"]
7475

7576
# from a derived Dockerfile, can use `RUN plugins.sh active.txt` to setup /usr/share/jenkins/ref/plugins from a support bundle

Dockerfile-slim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ USER ${user}
7070

7171
COPY jenkins-support /usr/local/bin/jenkins-support
7272
COPY jenkins.sh /usr/local/bin/jenkins.sh
73+
COPY tini-shim.sh /bin/tini
7374
ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"]
7475

7576
# from a derived Dockerfile, can use `RUN plugins.sh active.txt` to setup /usr/share/jenkins/ref/plugins from a support bundle

tini-shim.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
set -euo pipefail
33

44
cat <<EOF
5-
Please update your scripts to use /sbin/tini going forward.
6-
Previous path has been preserved for backwards compatibility in Alpine 3.4,
7-
but WILL BE REMOVED in Alpine 3.5. (or Jenkins 2.107.1 or something like this for our case)
5+
***************************************************************************
6+
* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING *
7+
***************************************************************************
8+
Please update your scripts to use /sbin/tini or simply tini going forward.
9+
Previous path has been preserved for backwards compatibility,
10+
but WILL BE REMOVED in the future. (around Jenkins >= 2.107.2+)
811
912
Now sleeping 2 minutes...
1013
EOF

0 commit comments

Comments
 (0)