From b269359ba6d5fc12c721a6eb2c3fc9b2f78dd3dc Mon Sep 17 00:00:00 2001 From: Felipe dos Santos Date: Fri, 26 Sep 2025 10:58:29 -0300 Subject: [PATCH 1/2] build: add libfido2-1 dependency to Dockerfiles for arm and distroless images --- build.assets/Dockerfile-arm | 1 + build.assets/charts/Dockerfile-distroless | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.assets/Dockerfile-arm b/build.assets/Dockerfile-arm index 24ae7e6715589..b6fcae28bc4b9 100644 --- a/build.assets/Dockerfile-arm +++ b/build.assets/Dockerfile-arm @@ -30,6 +30,7 @@ RUN apt-get -y update && \ gzip \ libc6-dev \ libpam-dev \ + libfido2-1 \ locales \ pkg-config \ sudo \ diff --git a/build.assets/charts/Dockerfile-distroless b/build.assets/charts/Dockerfile-distroless index 3df8ee5f4f56d..e43fdf8d7d635 100644 --- a/build.assets/charts/Dockerfile-distroless +++ b/build.assets/charts/Dockerfile-distroless @@ -3,7 +3,7 @@ ARG BASE_IMAGE=gcr.io/distroless/cc-debian12 FROM debian:12 AS staging RUN apt-get update COPY fetch-debs ./ -RUN ./fetch-debs dumb-init libpam0g libaudit1 libcap-ng0 +RUN ./fetch-debs dumb-init libpam0g libaudit1 libcap-ng0 libfido2-1 FROM debian:12 AS teleport # Install the teleport binary from an architecture-specific debian package. Note @@ -33,7 +33,6 @@ FROM $BASE_IMAGE COPY --from=teleport /opt/staging / COPY --from=staging /opt/staging/root / COPY --from=staging /opt/staging/status /var/lib/dpkg/status.d -ENV TELEPORT_TOOLS_VERSION=off # Attempt a graceful shutdown by default # See https://goteleport.com/docs/reference/signals/ for signal reference. STOPSIGNAL SIGQUIT From 5f6842dfd552952a7edd996397c7f80ad414ead6 Mon Sep 17 00:00:00 2001 From: Felipe dos Santos Date: Fri, 26 Sep 2025 13:41:43 -0300 Subject: [PATCH 2/2] build: set TELEPORT_TOOLS_VERSION environment variable in distroless Dockerfile --- build.assets/charts/Dockerfile-distroless | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.assets/charts/Dockerfile-distroless b/build.assets/charts/Dockerfile-distroless index e43fdf8d7d635..fd467924feed7 100644 --- a/build.assets/charts/Dockerfile-distroless +++ b/build.assets/charts/Dockerfile-distroless @@ -33,6 +33,8 @@ FROM $BASE_IMAGE COPY --from=teleport /opt/staging / COPY --from=staging /opt/staging/root / COPY --from=staging /opt/staging/status /var/lib/dpkg/status.d +ENV TELEPORT_TOOLS_VERSION=off + # Attempt a graceful shutdown by default # See https://goteleport.com/docs/reference/signals/ for signal reference. STOPSIGNAL SIGQUIT