From dccfe26699bb2c0af38a7d0c465ea0b695f9e7d7 Mon Sep 17 00:00:00 2001 From: Jari Hodju Date: Fri, 3 May 2024 14:01:46 +0300 Subject: [PATCH] Use pkcs11-closer to remove sessions references --- Dockerfile | 3 +++ entrypoint.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index f2112ce..0793872 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,8 @@ RUN /packaging/build_colcon_sdk.sh ${TARGETARCH:-amd64} # ▲ runtime ──┐ # └── build ▼ +FROM ghcr.io/tiiuae/pkcs11-closer:sha-7bec028 AS closer + FROM ghcr.io/tiiuae/fog-ros-baseimage:v3.2.0 RUN apt-get update \ @@ -21,4 +23,5 @@ RUN apt-get update \ COPY entrypoint.sh /entrypoint.sh ENTRYPOINT [ "/entrypoint.sh" ] +COPY --from=closer /pkcs11-closer / COPY --from=builder $INSTALL_DIR $INSTALL_DIR diff --git a/entrypoint.sh b/entrypoint.sh index 9ea9371..24f2858 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -33,6 +33,8 @@ trap - TERM wait $child RESULT=$? +/pkcs11-closer --label ntrip-client + if [ $RESULT -ne 0 ]; then echo "ERROR: ntrip node failed with code $RESULT" >&2 exit $RESULT