From 4752cac0511879a6c0dbcacf11fafc43a9cd8781 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 11 Jun 2020 17:21:01 -0700 Subject: [PATCH] Remove unused "sudo" package from most images Notably missing is the "log" image, which still uses sudo. Signed-off-by: Tianon Gravi --- make/photon/chartserver/Dockerfile.base | 2 +- make/photon/clair-adapter/Dockerfile.base | 4 +--- make/photon/clair/Dockerfile.base | 2 +- make/photon/core/Dockerfile.base | 2 +- make/photon/jobservice/Dockerfile.base | 2 +- make/photon/nginx/Dockerfile.base | 2 +- make/photon/notary-server/Dockerfile.base | 2 +- make/photon/notary-signer/Dockerfile.base | 2 +- make/photon/portal/Dockerfile.base | 2 +- make/photon/redis/Dockerfile.base | 2 +- make/photon/registry/Dockerfile.base | 4 +--- make/photon/registryctl/Dockerfile.base | 4 +--- make/photon/trivy-adapter/Dockerfile.base | 2 +- 13 files changed, 13 insertions(+), 19 deletions(-) diff --git a/make/photon/chartserver/Dockerfile.base b/make/photon/chartserver/Dockerfile.base index ecf7b9034..91db6f5ef 100644 --- a/make/photon/chartserver/Dockerfile.base +++ b/make/photon/chartserver/Dockerfile.base @@ -1,6 +1,6 @@ FROM photon:2.0 -RUN tdnf install -y shadow sudo >>/dev/null\ +RUN tdnf install -y shadow >>/dev/null\ && tdnf clean all \ && groupadd -r -g 10000 chart \ && useradd --no-log-init -m -g 10000 -u 10000 chart diff --git a/make/photon/clair-adapter/Dockerfile.base b/make/photon/clair-adapter/Dockerfile.base index 80b257f60..fb44c3014 100644 --- a/make/photon/clair-adapter/Dockerfile.base +++ b/make/photon/clair-adapter/Dockerfile.base @@ -1,7 +1,5 @@ FROM photon:2.0 -RUN tdnf install -y sudo >>/dev/null\ - && tdnf clean all \ - && mkdir /clair-adapter/ \ +RUN mkdir /clair-adapter/ \ && groupadd -r -g 10000 clair-adapter \ && useradd --no-log-init -m -r -g 10000 -u 10000 clair-adapter \ No newline at end of file diff --git a/make/photon/clair/Dockerfile.base b/make/photon/clair/Dockerfile.base index 8f9737450..80d5df287 100644 --- a/make/photon/clair/Dockerfile.base +++ b/make/photon/clair/Dockerfile.base @@ -1,6 +1,6 @@ FROM photon:2.0 -RUN tdnf install -y git shadow sudo rpm xz python-xml >>/dev/null\ +RUN tdnf install -y git shadow rpm xz python-xml >>/dev/null\ && tdnf clean all \ && groupadd -r -g 10000 clair \ && useradd --no-log-init -m -g 10000 -u 10000 clair \ No newline at end of file diff --git a/make/photon/core/Dockerfile.base b/make/photon/core/Dockerfile.base index 865834fad..636392879 100644 --- a/make/photon/core/Dockerfile.base +++ b/make/photon/core/Dockerfile.base @@ -1,6 +1,6 @@ FROM photon:2.0 -RUN tdnf install sudo tzdata -y >> /dev/null \ +RUN tdnf install tzdata -y >> /dev/null \ && tdnf clean all \ && groupadd -r -g 10000 harbor && useradd --no-log-init -r -m -g 10000 -u 10000 harbor \ && mkdir /harbor/ diff --git a/make/photon/jobservice/Dockerfile.base b/make/photon/jobservice/Dockerfile.base index 5bbd68138..0d1b4bc51 100644 --- a/make/photon/jobservice/Dockerfile.base +++ b/make/photon/jobservice/Dockerfile.base @@ -1,5 +1,5 @@ FROM photon:2.0 -RUN tdnf install sudo tzdata -y >> /dev/null \ +RUN tdnf install tzdata -y >> /dev/null \ && tdnf clean all \ && groupadd -r -g 10000 harbor && useradd --no-log-init -r -m -g 10000 -u 10000 harbor diff --git a/make/photon/nginx/Dockerfile.base b/make/photon/nginx/Dockerfile.base index 8982dc00e..b56ddf9ae 100644 --- a/make/photon/nginx/Dockerfile.base +++ b/make/photon/nginx/Dockerfile.base @@ -1,6 +1,6 @@ FROM photon:2.0 -RUN tdnf install sudo nginx -y >> /dev/null\ +RUN tdnf install nginx -y >> /dev/null\ && tdnf clean all \ && groupadd -r -g 10000 nginx && useradd --no-log-init -r -g 10000 -u 10000 nginx \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/make/photon/notary-server/Dockerfile.base b/make/photon/notary-server/Dockerfile.base index da4b03cbe..5ba92765a 100644 --- a/make/photon/notary-server/Dockerfile.base +++ b/make/photon/notary-server/Dockerfile.base @@ -1,6 +1,6 @@ FROM photon:2.0 -RUN tdnf install -y shadow sudo \ +RUN tdnf install -y shadow \ && tdnf clean all \ && groupadd -r -g 10000 notary \ && useradd --no-log-init -r -g 10000 -u 10000 notary diff --git a/make/photon/notary-signer/Dockerfile.base b/make/photon/notary-signer/Dockerfile.base index da4b03cbe..5ba92765a 100644 --- a/make/photon/notary-signer/Dockerfile.base +++ b/make/photon/notary-signer/Dockerfile.base @@ -1,6 +1,6 @@ FROM photon:2.0 -RUN tdnf install -y shadow sudo \ +RUN tdnf install -y shadow \ && tdnf clean all \ && groupadd -r -g 10000 notary \ && useradd --no-log-init -r -g 10000 -u 10000 notary diff --git a/make/photon/portal/Dockerfile.base b/make/photon/portal/Dockerfile.base index 28d4a036f..330c64f52 100644 --- a/make/photon/portal/Dockerfile.base +++ b/make/photon/portal/Dockerfile.base @@ -1,6 +1,6 @@ FROM photon:2.0 -RUN tdnf install -y nginx sudo >> /dev/null \ +RUN tdnf install -y nginx >> /dev/null \ && ln -sf /dev/stdout /var/log/nginx/access.log \ && ln -sf /dev/stderr /var/log/nginx/error.log \ && groupadd -r -g 10000 nginx && useradd --no-log-init -r -g 10000 -u 10000 nginx \ diff --git a/make/photon/redis/Dockerfile.base b/make/photon/redis/Dockerfile.base index d800f6a91..b0970b4ef 100644 --- a/make/photon/redis/Dockerfile.base +++ b/make/photon/redis/Dockerfile.base @@ -1,3 +1,3 @@ FROM photon:2.0 -RUN tdnf install -y redis sudo && tdnf clean all +RUN tdnf install -y redis && tdnf clean all diff --git a/make/photon/registry/Dockerfile.base b/make/photon/registry/Dockerfile.base index 0e618e1b8..e237eb5ae 100644 --- a/make/photon/registry/Dockerfile.base +++ b/make/photon/registry/Dockerfile.base @@ -1,6 +1,4 @@ FROM photon:2.0 -RUN tdnf install sudo -y >> /dev/null\ - && tdnf clean all \ - && mkdir -p /etc/registry \ +RUN mkdir -p /etc/registry \ && groupadd -r -g 10000 harbor && useradd --no-log-init -m -g 10000 -u 10000 harbor \ No newline at end of file diff --git a/make/photon/registryctl/Dockerfile.base b/make/photon/registryctl/Dockerfile.base index c53686341..9affefff1 100644 --- a/make/photon/registryctl/Dockerfile.base +++ b/make/photon/registryctl/Dockerfile.base @@ -1,6 +1,4 @@ FROM photon:2.0 -RUN tdnf install sudo -y >> /dev/null \ - && tdnf clean all \ - && groupadd -r -g 10000 harbor && useradd --no-log-init -m -g 10000 -u 10000 harbor \ +RUN groupadd -r -g 10000 harbor && useradd --no-log-init -m -g 10000 -u 10000 harbor \ && mkdir -p /etc/registry diff --git a/make/photon/trivy-adapter/Dockerfile.base b/make/photon/trivy-adapter/Dockerfile.base index 3b38817dc..223ce2d74 100644 --- a/make/photon/trivy-adapter/Dockerfile.base +++ b/make/photon/trivy-adapter/Dockerfile.base @@ -1,6 +1,6 @@ FROM photon:2.0 -RUN tdnf install -y sudo rpm >> /dev/null \ +RUN tdnf install -y rpm >> /dev/null \ && tdnf clean all \ && groupadd -r -g 10000 scanner \ && useradd --no-log-init -m -r -g 10000 -u 10000 scanner