From 569db8a1e673b97ab7ba4ea04ccbcfe954da881d Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sat, 17 Aug 2024 17:15:44 -0700 Subject: [PATCH] client: Dockerfiles: dev-tools: refactor to use `yq` Replaces `shyaml` dependency with `yq`. --- client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in | 10 +--------- .../Dockerfiles/dev-tools/Dockerfile.dev-tools.in | 3 +-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in b/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in index ff9a0e8..ddd3f0b 100644 --- a/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in +++ b/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in @@ -86,15 +86,7 @@ RUN apt-get install -y doxygen graphviz # Client-side `version` command # -RUN apt-get install -y pipx - -USER @DOCKER_FINANCE_USER@ -WORKDIR /home/@DOCKER_FINANCE_USER@ - -RUN pipx install shyaml -RUN echo "export PATH=\"\$PATH:\${HOME}/.local/bin\"" | tee -a ~/.bash_aliases - -USER root +RUN apt-get install -y yq # # Entrypoint diff --git a/client/docker-finance.d/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in b/client/docker-finance.d/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in index e2a9746..30a1d34 100644 --- a/client/docker-finance.d/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in +++ b/client/docker-finance.d/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in @@ -24,8 +24,7 @@ USER root RUN apt-get update -y RUN apt-get install -y \ - curl \ - yq + curl USER @DOCKER_FINANCE_USER@ WORKDIR /home/@DOCKER_FINANCE_USER@