From 284dd1d607588c69e8633755a837b42935c35225 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sun, 18 Aug 2024 01:54:06 -0700 Subject: [PATCH] client: Dockerfiles: add commented `pipx` optional userspace - `pipx` is no longer required by the base image * Package would be required for previous `xlsx2csv` install --- .../client/Dockerfiles/finance/Dockerfile.archlinux.in | 10 +++++++--- .../client/Dockerfiles/finance/Dockerfile.ubuntu.in | 9 ++++++--- 2 files changed, 13 insertions(+), 6 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 ef1bd95..6395d0f 100644 --- a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in +++ b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in @@ -36,9 +36,13 @@ RUN pacman -Syu \ # Optional userspace (python / ROOT.cern custom metadata analysis) # -USER @DOCKER_FINANCE_USER@ -WORKDIR /home/@DOCKER_FINANCE_USER@ +#RUN pacman -Syu \ +# python-pipx \ +# --noconfirm --disable-download-timeout -RUN pipx install xlsx2csv +#USER @DOCKER_FINANCE_USER@ +#WORKDIR /home/@DOCKER_FINANCE_USER@ + +#RUN pipx install xlsx2csv # vim: sw=2 sts=2 si ai et 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 0b18004..d85c626 100644 --- a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in +++ b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in @@ -37,9 +37,12 @@ RUN apt-get install -y \ # Optional userspace (python) # -USER @DOCKER_FINANCE_USER@ -WORKDIR /home/@DOCKER_FINANCE_USER@ +#RUN apt-get install -y \ +# pipx -RUN pipx install xlsx2csv +#USER @DOCKER_FINANCE_USER@ +#WORKDIR /home/@DOCKER_FINANCE_USER@ + +#RUN pipx install xlsx2csv # vim: sw=2 sts=2 si ai et