client: Dockerfiles: remove shyaml package, add yq

- Replaces `shyaml` dependency with `yq`
  * Less dependency upon `pipx` (`csvcut` is next to go)
  * `yq` will be needed by a container plugin
This commit is contained in:
2024-08-17 17:13:23 -07:00
parent ea9ceea06a
commit 237a4c20ab
2 changed files with 2 additions and 2 deletions

View File

@@ -47,11 +47,11 @@ RUN pacman -Syu \
vim \ vim \
visidata \ visidata \
xsv \ xsv \
yq \
--noconfirm --disable-download-timeout --noconfirm --disable-download-timeout
USER @DOCKER_FINANCE_USER@ USER @DOCKER_FINANCE_USER@
WORKDIR /home/@DOCKER_FINANCE_USER@ WORKDIR /home/@DOCKER_FINANCE_USER@
RUN pipx install shyaml
RUN pipx install csvkit RUN pipx install csvkit
# #

View File

@@ -52,6 +52,7 @@ RUN apt-get install -y \
timewarrior \ timewarrior \
vim \ vim \
visidata \ visidata \
yq \
zlib1g-dev zlib1g-dev
RUN apt-get install -y cargo RUN apt-get install -y cargo
@@ -59,7 +60,6 @@ RUN cargo install xsv --root /usr
USER @DOCKER_FINANCE_USER@ USER @DOCKER_FINANCE_USER@
WORKDIR /home/@DOCKER_FINANCE_USER@ WORKDIR /home/@DOCKER_FINANCE_USER@
RUN pipx install shyaml
RUN pipx install csvkit RUN pipx install csvkit
# #