From 3b01ce8cc755e11b492632f241ecd61e5f39c45e Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sun, 18 Aug 2024 01:44:13 -0700 Subject: [PATCH 1/4] client: Dockerfiles: remove `pipx`, replace with packaged `csvkit` --- client/Dockerfiles/finance/Dockerfile.archlinux.in | 6 +----- client/Dockerfiles/finance/Dockerfile.ubuntu.in | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/client/Dockerfiles/finance/Dockerfile.archlinux.in b/client/Dockerfiles/finance/Dockerfile.archlinux.in index 11d1548..d975991 100644 --- a/client/Dockerfiles/finance/Dockerfile.archlinux.in +++ b/client/Dockerfiles/finance/Dockerfile.archlinux.in @@ -37,12 +37,12 @@ RUN chown root:wheel /usr/local/* && chmod g+rwx /usr/local/* # RUN pacman -Syu \ + csvkit \ git \ hledger \ hledger-iadd \ hledger-ui \ hledger-web \ - python-pipx \ timew \ vim \ visidata \ @@ -50,10 +50,6 @@ RUN pacman -Syu \ yq \ --noconfirm --disable-download-timeout -USER @DOCKER_FINANCE_USER@ -WORKDIR /home/@DOCKER_FINANCE_USER@ -RUN pipx install csvkit - # # `fetch` APIs # diff --git a/client/Dockerfiles/finance/Dockerfile.ubuntu.in b/client/Dockerfiles/finance/Dockerfile.ubuntu.in index fab1cd1..066bf54 100644 --- a/client/Dockerfiles/finance/Dockerfile.ubuntu.in +++ b/client/Dockerfiles/finance/Dockerfile.ubuntu.in @@ -43,12 +43,12 @@ RUN chown root:wheel /usr/local/* && chmod g+rwx /usr/local/* RUN apt-get update -y RUN apt-get install -y \ + csvkit \ gawk \ git \ hledger \ hledger-ui \ hledger-web \ - pipx \ timewarrior \ vim \ visidata \ @@ -58,10 +58,6 @@ RUN apt-get install -y \ RUN apt-get install -y cargo RUN cargo install xsv --root /usr -USER @DOCKER_FINANCE_USER@ -WORKDIR /home/@DOCKER_FINANCE_USER@ -RUN pipx install csvkit - # # `fetch` APIs # From 37a4a630d9d45783fe2a24a5560c6b8e4a6ec6e8 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sun, 18 Aug 2024 01:48:02 -0700 Subject: [PATCH 2/4] client: manifest: remove `pipx`, replace with packaged `csvkit` --- client/docker-finance.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/client/docker-finance.yaml b/client/docker-finance.yaml index a2bdcab..4563d4f 100644 --- a/client/docker-finance.yaml +++ b/client/docker-finance.yaml @@ -37,13 +37,13 @@ container: base: packages: - "bc" + - "csvkit" - "git" - "hledger" - "hledger-iadd" - "hledger-ui" - "hledger-web" - "proxychains-ng" - - "python-pipx" - "stack" - "timew" - "vim" @@ -53,7 +53,6 @@ container: # For experimental build #- "unuran" commands: - - "csvstat --version" - "ghc-pkg --version" - "hledger-flow --version" fetch: @@ -84,13 +83,13 @@ container: packages: - "bc" - "cargo" + - "csvkit" - "g++" - "git" - "haskell-stack" - "hledger" - "hledger-ui" - "hledger-web" - - "pipx" - "proxychains4" - "timewarrior" - "vim" @@ -100,7 +99,6 @@ container: # For experimental build #- "libunuran-dev" commands: - - "csvstat --version" - "ghc-pkg --version" - "hledger-flow --version" - "xsv --version" From 284dd1d607588c69e8633755a837b42935c35225 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sun, 18 Aug 2024 01:54:06 -0700 Subject: [PATCH 3/4] 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 From b4fcc2ae0d610613fd7391efd1d1a40567f1dbb6 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sun, 18 Aug 2024 02:01:06 -0700 Subject: [PATCH 4/4] 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)