build: use DHI sources (#85)

* build: use `kubectl` from DHI

* build: use base image from DHI

Author: masontikhonov

Dockerfile

@@ -1,18 +1,15 @@
-FROM debian:trixie-20251229-slim AS prod
-ARG TARGETPLATFORM
-RUN /sbin/useradd --home /home/cfu --shell /bin/bash cfu
-COPY --chown=cfu --chmod=775 cf-deploy-kubernetes.sh /cf-deploy-kubernetes
-COPY --chown=cfu --chmod=775 template.sh /template.sh
-COPY --from=busybox:1.37.0-glibc /bin/busybox /usr/bin/busybox
-RUN busybox --install
+# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base/customizations/8303889275873263714
+FROM octopusdeploy/dhi-debian-base:trixie_cf-classic-deploy-kubernetes-debian13 AS prod
+COPY --chown=nonroot --chmod=775 cf-deploy-kubernetes.sh /cf-deploy-kubernetes
+COPY --chown=nonroot --chmod=775 template.sh /template.sh
 # ⚠️ We support 3 most recent minor versions: https://kubernetes.io/releases/
 # Please update `./cf-deploy-kubernetes.sh` accordingly.
-ADD --chown=cfu --chmod=775 https://dl.k8s.io/release/v1.34.3/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl1.34
-ADD --chown=cfu --chmod=775 https://dl.k8s.io/release/v1.33.7/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl1.33
-ADD --chown=cfu --chmod=775 https://dl.k8s.io/release/v1.32.11/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl1.32
+COPY --chown=nonroot --chmod=775 --from=octopusdeploy/dhi-kubectl:1.34-debian13 /usr/local/bin/kubectl /usr/local/bin/kubectl1.34
+COPY --chown=nonroot --chmod=775 --from=octopusdeploy/dhi-kubectl:1.33-debian13 /usr/local/bin/kubectl /usr/local/bin/kubectl1.33
+COPY --chown=nonroot --chmod=775 --from=octopusdeploy/dhi-kubectl:1.32-debian13 /usr/local/bin/kubectl /usr/local/bin/kubectl1.32
 # ⚠️ Defaults to the latest version. Please update with new versions as needed.
 RUN ln -s /usr/local/bin/kubectl1.34 /usr/local/bin/kubectl
 
 WORKDIR /
-USER cfu
+USER nonroot
 CMD ["bash"]

service.yaml

@@ -1 +1 @@
-version: 17.0.1
+version: 17.0.2