Remove tini from Typha

- Avoid a download in the dockerfile. - Typha has never spawned processes (and now runs in scratch so there's nothing to spawn). - As of the graceful shutdown work, typha responds to SIGTERM etc so no need for an init daemon to do it.
projectcalico · Dec 6, 2023 · 1228a7e · 1228a7e
1 parent 9d33435
commit 1228a7e
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 28 deletions.
diff --git a/typha/docker-image/Dockerfile.amd64 b/typha/docker-image/Dockerfile.amd64
@@ -17,11 +17,6 @@ ARG UBI_IMAGE
 
 FROM ${UBI_IMAGE} as ubi
 
-# Since our binary isn't designed to run as PID 1, run it via the tini init daemon.
-ENV TINI_VERSION v0.18.0
-COPY https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-amd64 /sbin/tini
-RUN chmod +x /sbin/tini
-
 # Add in top-level license file
 RUN mkdir /licenses
 COPY licenses /licenses
@@ -37,7 +32,6 @@ LABEL name="Calico Typha" \
       description="Calico Typha is a fan-out datastore proxy" \
       maintainer="Shaun Crampton <shaun@tigera.io>"
 
-COPY --from=ubi /sbin/tini /sbin/tini
 COPY --from=ubi /licenses /licenses
 
 COPY --from=ubi /usr/include /usr/include
@@ -67,5 +61,4 @@ ENV PATH="$PATH:/code"
 
 USER 999
 # Run Typha by default
-ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["calico-typha"]
diff --git a/typha/docker-image/Dockerfile.arm64 b/typha/docker-image/Dockerfile.arm64
@@ -25,13 +25,7 @@ MAINTAINER Shaun Crampton <shaun@tigera.io>
 # when running on a kernel >= 4.8, this will become less relevant
 COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/
 
-# Since our binary isn't designed to run as PID 1, run it via the tini init daemon.
-ENV TINI_VERSION v0.18.0
-COPY https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-arm64 /sbin/tini
-RUN chmod +x /sbin/tini
-
 FROM scratch
-COPY --from=base /sbin/tini /sbin/tini
 
 # Put our binary in /code rather than directly in /usr/bin.  This allows the downstream builds
 # to more easily extract the build artefacts from the container.
@@ -43,5 +37,4 @@ ENV PATH "$PATH:/code"
 
 USER 999
 # Run Typha by default
-ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["calico-typha"]
diff --git a/typha/docker-image/Dockerfile.ppc64le b/typha/docker-image/Dockerfile.ppc64le
@@ -25,13 +25,7 @@ MAINTAINER Shaun Crampton <shaun@tigera.io>
 # when running on a kernel >= 4.8, this will become less relevant
 COPY --from=qemu /usr/bin/qemu-ppc64le-static /usr/bin/
 
-# Since our binary isn't designed to run as PID 1, run it via the tini init daemon.
-ENV TINI_VERSION v0.18.0
-COPY https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-ppc64el /sbin/tini
-RUN chmod +x /sbin/tini
-
 FROM scratch
-COPY --from=base /sbin/tini /sbin/tini
 
 # Put our binary in /code rather than directly in /usr/bin.  This allows the downstream builds
 # to more easily extract the build artefacts from the container.
@@ -43,5 +37,4 @@ ENV PATH "$PATH:/code"
 
 USER 999
 # Run Typha by default
-ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["calico-typha"]
diff --git a/typha/docker-image/Dockerfile.s390x b/typha/docker-image/Dockerfile.s390x
@@ -25,13 +25,7 @@ MAINTAINER LoZ Open Source Ecosystem (https://www.ibm.com/developerworks/communi
 # when running on a kernel >= 4.8, this will become less relevant
 COPY --from=qemu /usr/bin/qemu-*-static /usr/bin/
 
-# Since our binary isn't designed to run as PID 1, run it via the tini init daemon.
-ENV TINI_VERSION v0.18.0
-COPY https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-s390x /sbin/tini
-RUN chmod +x /sbin/tini
-
 FROM scratch
-COPY --from=base /sbin/tini /sbin/tini
 
 # Put our binary in /code rather than directly in /usr/bin.  This allows the downstream builds
 # to more easily extract the build artefacts from the container.
@@ -43,5 +37,4 @@ ENV PATH "$PATH:/code"
 
 USER 999
 # Run Typha by default
-ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["calico-typha"]