From 270e6e7e629341aa44142781942dd9e138adb874 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Tue, 10 Mar 2026 17:02:19 -0700 Subject: [PATCH 1/4] client: archlinux: add 'Related "useful" packages' section (for consistenly useful packages that aren't dependencies) and move `less` from "Base dependencies" to this section. --- .../remote/docker-finance/finance/Dockerfile.archlinux | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/client/Dockerfiles/remote/docker-finance/finance/Dockerfile.archlinux b/client/Dockerfiles/remote/docker-finance/finance/Dockerfile.archlinux index ded7d1c..4de55cb 100644 --- a/client/Dockerfiles/remote/docker-finance/finance/Dockerfile.archlinux +++ b/client/Dockerfiles/remote/docker-finance/finance/Dockerfile.archlinux @@ -36,12 +36,19 @@ RUN pacman -Syu --noconfirm --disable-download-timeout RUN pacman -Syu \ bc \ csvkit \ - less \ vim \ xan \ yq \ --noconfirm --disable-download-timeout +# +# Related "useful" packages (not dependencies) +# + +RUN pacman -Syu \ + less \ + --noconfirm --disable-download-timeout + # # Entrypoint # From dbbe42466c9e7348e2300734ef45463a3080fbe0 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Tue, 10 Mar 2026 17:05:09 -0700 Subject: [PATCH 2/4] client: archlinux: move `calc` package to base image as it is a 'Related "useful" package'. --- .../remote/docker-finance/finance/Dockerfile.archlinux | 1 + .../client/Dockerfiles/finance/Dockerfile.archlinux.in | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/client/Dockerfiles/remote/docker-finance/finance/Dockerfile.archlinux b/client/Dockerfiles/remote/docker-finance/finance/Dockerfile.archlinux index 4de55cb..7c9d5b0 100644 --- a/client/Dockerfiles/remote/docker-finance/finance/Dockerfile.archlinux +++ b/client/Dockerfiles/remote/docker-finance/finance/Dockerfile.archlinux @@ -46,6 +46,7 @@ RUN pacman -Syu \ # RUN pacman -Syu \ + calc \ less \ --noconfirm --disable-download-timeout diff --git a/client/conf.d/client/Dockerfiles/finance/Dockerfile.archlinux.in b/client/conf.d/client/Dockerfiles/finance/Dockerfile.archlinux.in index 9303edd..1a09130 100644 --- a/client/conf.d/client/Dockerfiles/finance/Dockerfile.archlinux.in +++ b/client/conf.d/client/Dockerfiles/finance/Dockerfile.archlinux.in @@ -36,11 +36,6 @@ RUN pacman -Syu --noconfirm ## Optional (examples) ## -## Finance-related -#RUN pacman -Syu \ -# calc \ -# --noconfirm --disable-download-timeout - ## Text editors #RUN pacman -Syu \ # emacs-nox \ From 070a66460cd543f1e732894bb6eb33923e9002e8 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Tue, 10 Mar 2026 17:10:23 -0700 Subject: [PATCH 3/4] client: manifest: archlinux: finance: add "related" category Describes packages/commands that are "related" but not dependencies. --- client/docker-finance.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/docker-finance.yaml b/client/docker-finance.yaml index 100dec7..8768244 100644 --- a/client/docker-finance.yaml +++ b/client/docker-finance.yaml @@ -48,6 +48,11 @@ container: - "hledger-iadd --version" - "hledger-ui --version" - "hledger-web --version" + related: + packages: + - "calc" + - "less" + commands: fetch: packages: - "composer" From 07a1081751eac6eb7876c409cac54888c9127d65 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Tue, 10 Mar 2026 17:16:23 -0700 Subject: [PATCH 4/4] repo: gitea: workflows: dfi: update edit of build file --- .gitea/workflows/dfi.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/dfi.bash b/.gitea/workflows/dfi.bash index 940de22..d19d3de 100755 --- a/.gitea/workflows/dfi.bash +++ b/.gitea/workflows/dfi.bash @@ -140,7 +140,7 @@ function client::finance::edit() # Build: uncomment all optional packages and plugin dependencies from custom build file _file="${_path}/Dockerfiles/${USER:?}@$(uname -n)" [ ! -f "$_file" ] && exit 1 - sed -i '18,56s/#//' "$_file" + sed -i '18,51s/#//' "$_file" # Build: uncomment custom compose merge file _file+=".yml"