diff --git a/Dockerfile b/Dockerfile index aca87bc..3c507e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,19 +3,9 @@ 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 +22,15 @@ RUN apt-get update \ FROM debian:trixie-slim +# renovate: datasource=github-releases depName=janosmiko/lfk +ARG LFK_VERSION=0.14.15 +# 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 + ENV DEBIAN_FRONTEND=noninteractive \ WEB_SSH_PORT=3000 \ @@ -58,9 +57,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,13 +105,9 @@ 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 \ 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