From b4fcc2ae0d610613fd7391efd1d1a40567f1dbb6 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sun, 18 Aug 2024 02:01:06 -0700 Subject: [PATCH] client: Dockerfiles: comment all optional userspace packages - Shouldn't be applied to base image by default - Also removes `mc` from Ubuntu image as `mc` (more useful client-side) --- .../Dockerfiles/finance/Dockerfile.archlinux.in | 17 ++++++++++------- .../Dockerfiles/finance/Dockerfile.ubuntu.in | 15 ++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in index 6395d0f..787ae20 100644 --- a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in +++ b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in @@ -23,14 +23,17 @@ # Optional userspace # -USER root +#USER root -RUN pacman -Syu \ - calc \ - emacs-nox \ - less \ - nano \ - --noconfirm --disable-download-timeout +#RUN pacman -Syu \ +# calc \ +# less \ +# --noconfirm --disable-download-timeout + +#RUN pacman -Syu \ +# emacs-nox \ +# nano \ +# --noconfirm --disable-download-timeout # # Optional userspace (python / ROOT.cern custom metadata analysis) diff --git a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in index d85c626..aa2fdc2 100644 --- a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in +++ b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in @@ -23,15 +23,12 @@ # Optional userspace # -USER root - -RUN apt-get update -y - -RUN apt-get install -y \ - calc \ - emacs-nox \ - mc \ - nano +#USER root +#RUN apt-get update -y +#RUN apt-get install -y \ +# calc \ +# emacs-nox \ +# nano # # Optional userspace (python)