From 675df168742823d7a25aa57ff9ba165dd20f0767 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Sun, 16 Apr 2023 10:09:52 -0400 Subject: [PATCH 1/2] install utilities in cli container image --- docker-images/ziti-cli/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-images/ziti-cli/Dockerfile b/docker-images/ziti-cli/Dockerfile index d33bb7ca5..125fb3628 100644 --- a/docker-images/ziti-cli/Dockerfile +++ b/docker-images/ziti-cli/Dockerfile @@ -28,7 +28,7 @@ LABEL name="openziti/ziti-cli" \ USER root ### install packages -RUN INSTALL_PKGS="python38 python38-pip tar bash-completion" && \ +RUN INSTALL_PKGS="python38 python38-pip tar bash-completion vim-minimal less" && \ microdnf -y update --setopt=install_weak_deps=0 --setopt=tsflags=nodocs && \ microdnf -y install --setopt=install_weak_deps=0 --setopt=tsflags=nodocs ${INSTALL_PKGS} From 49e081103ef85205c867010e9f9fded711861c5a Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Sun, 16 Apr 2023 14:28:38 -0400 Subject: [PATCH 2/2] run as ziggy --- docker-images/ziti-controller/Dockerfile | 2 +- docker-images/ziti-router/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-images/ziti-controller/Dockerfile b/docker-images/ziti-controller/Dockerfile index 791490a0a..71fe158fd 100644 --- a/docker-images/ziti-controller/Dockerfile +++ b/docker-images/ziti-controller/Dockerfile @@ -16,6 +16,6 @@ LABEL name="openziti/ziti-controller" \ USER root COPY ./entrypoint.sh / RUN chmod +x /entrypoint.sh -USER nobody +USER ziggy ENTRYPOINT [ "/entrypoint.sh" ] CMD [ "run" ] diff --git a/docker-images/ziti-router/Dockerfile b/docker-images/ziti-router/Dockerfile index 5b7ccfd7d..eb6b1c682 100644 --- a/docker-images/ziti-router/Dockerfile +++ b/docker-images/ziti-router/Dockerfile @@ -16,6 +16,6 @@ LABEL name="openziti/ziti-router" \ USER root COPY ./entrypoint.sh / RUN chmod +x /entrypoint.sh -USER nobody +USER ziggy ENTRYPOINT [ "/entrypoint.sh" ] CMD [ "run" ]