From 709dd6d0b617df4f29e821ba4859458b7899fd39 Mon Sep 17 00:00:00 2001 From: michael Date: Wed, 24 Jun 2026 11:18:15 +0000 Subject: [PATCH 1/4] revert f0e72c69a0810cfefe0423e01851eb09e0057209 revert Add locales support and set UTF-8 environment variables in Dockerfile --- Dockerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index aca87bc..e3d0044 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,9 +58,6 @@ RUN apt-get update \ openssl \ sudo \ tini \ - locales \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /var/run/sshd /var/lib/k8s-mgmt-pod /etc/ssh/sshd_config.d \ && useradd --create-home --shell /bin/bash admin \ @@ -109,10 +106,6 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh RUN chmod 0755 /usr/local/bin/entrypoint.sh \ && chmod 0644 /etc/profile.d/20-k8s-tools-completion.sh -ENV LANG=en_US.UTF-8 -ENV LANGUAGE=en_US:en -ENV LC_ALL=en_US.UTF-8 - EXPOSE 2222 3000 HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=3 \ From 0553a4815c06b3efc68b19bcf791d6b81a745ab4 Mon Sep 17 00:00:00 2001 From: Michael Trip Date: Wed, 24 Jun 2026 13:21:35 +0200 Subject: [PATCH 2/4] reverting back to working example --- Dockerfile | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index e3d0044..2e4d40d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,19 +3,8 @@ FROM ${NODE_IMAGE} AS webssh2-builder ENV DEBIAN_FRONTEND=noninteractive -# renovate: datasource=github-releases depName=janosmiko/lfk -ARG LFK_VERSION=0.14.9 -# renovate: datasource=github-releases depName=kubernetes/kubernetes -ARG KUBECTL_VERSION=1.31.0 -# renovate: datasource=github-releases depName=helm/helm -ARG HELM_VERSION=3.16.2 -# renovate: datasource=github-releases depName=derailed/k9s -ARG K9S_VERSION=0.40.10 -# renovate: datasource=github-releases depName=billchurch/webssh2 ARG WEBSSH2_VERSION=5.0.1 - - RUN apt-get update \ && apt-get install -y --no-install-recommends ca-certificates curl \ && rm -rf /var/lib/apt/lists/* \ @@ -32,6 +21,11 @@ RUN apt-get update \ FROM debian:trixie-slim +ARG LFK_VERSION=0.14.9 +ARG KUBECTL_VERSION=1.31.0 +ARG HELM_VERSION=3.16.2 +ARG K9S_VERSION=0.40.10 +ARG WEBSSH2_VERSION=5.0.1 ENV DEBIAN_FRONTEND=noninteractive \ WEB_SSH_PORT=3000 \ @@ -111,4 +105,4 @@ EXPOSE 2222 3000 HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=3 \ CMD nc -z 127.0.0.1 "${SSH_PORT:-2222}" || exit 1 -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/entrypoint.sh"] +ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/entrypoint.sh"] \ No newline at end of file From d4e935c470b19ff32e71e81d0b17de3b8dabf1c8 Mon Sep 17 00:00:00 2001 From: Michael Trip Date: Wed, 24 Jun 2026 13:26:14 +0200 Subject: [PATCH 3/4] Add renovate comments for dependency tracking in Dockerfile --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2e4d40d..19522fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ FROM ${NODE_IMAGE} AS webssh2-builder ENV DEBIAN_FRONTEND=noninteractive +# renovate: datasource=github-releases depName=billchurch/webssh2 ARG WEBSSH2_VERSION=5.0.1 RUN apt-get update \ @@ -21,11 +22,15 @@ RUN apt-get update \ FROM debian:trixie-slim +# renovate: datasource=github-releases depName=janosmiko/lfk ARG LFK_VERSION=0.14.9 +# renovate: datasource=github-releases depName=kubernetes/kubernetes ARG KUBECTL_VERSION=1.31.0 +# renovate: datasource=github-releases depName=helm/helm ARG HELM_VERSION=3.16.2 +# renovate: datasource=github-releases depName=derailed/k9s ARG K9S_VERSION=0.40.10 -ARG WEBSSH2_VERSION=5.0.1 + ENV DEBIAN_FRONTEND=noninteractive \ WEB_SSH_PORT=3000 \ From 335b11f4114c897b370c606343e2a354e91376dd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 24 Jun 2026 11:27:17 +0000 Subject: [PATCH 4/4] Update dependency derailed/k9s to v0.51.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 19522fb..17cb607 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ ARG KUBECTL_VERSION=1.31.0 # renovate: datasource=github-releases depName=helm/helm ARG HELM_VERSION=3.16.2 # renovate: datasource=github-releases depName=derailed/k9s -ARG K9S_VERSION=0.40.10 +ARG K9S_VERSION=0.51.0 ENV DEBIAN_FRONTEND=noninteractive \