From f2df54d3cc58f37edd1a3aacb7aaff166d3f8e76 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Thu, 11 Jul 2024 16:42:30 -0700 Subject: [PATCH] client: Dockerfiles: resolve `apt` CLI warning --- .../Dockerfiles/dev-tools/Dockerfile.dev-tools.in | 14 +++++++------- client/Dockerfiles/finance/Dockerfile.ubuntu.in | 8 ++++---- .../finance/ubuntu/Dockerfile.hledger-flow.bin.in | 2 +- .../finance/ubuntu/Dockerfile.hledger-flow.src.in | 2 +- .../Dockerfiles/finance/ubuntu/Dockerfile.root.in | 6 +++--- .../Dockerfiles/dev-tools/Dockerfile.dev-tools.in | 4 ++-- .../Dockerfiles/finance/Dockerfile.ubuntu.in | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in b/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in index e61405f..ff9a0e8 100644 --- a/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in +++ b/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in @@ -34,20 +34,20 @@ RUN gpasswd -a @DOCKER_FINANCE_USER@ wheel RUN useradd -m -s /bin/bash -r builder && gpasswd -a builder wheel RUN gpasswd -a builder wheel -RUN apt update -y +RUN apt-get update -y # # `dev-tools` Linters # # Bash -RUN apt install -y shfmt shellcheck +RUN apt-get install -y shfmt shellcheck # C++ -RUN apt install -y clang-format cppcheck cpplint +RUN apt-get install -y clang-format cppcheck cpplint # PHP -RUN apt install -y composer +RUN apt-get install -y composer USER @DOCKER_FINANCE_USER@ WORKDIR /home/@DOCKER_FINANCE_USER@ @@ -62,7 +62,7 @@ RUN echo "export PATH=\"\${PATH}:\${HOME}/.composer/vendor/bin\"" | tee -a ~/.ba # USER root -RUN apt install -y php php-bcmath php-curl php-gmp +RUN apt-get install -y php php-bcmath php-curl php-gmp USER builder WORKDIR /usr/local/lib/php @@ -80,13 +80,13 @@ RUN chown -R :wheel /usr/local/lib/php && chmod g+rwx /usr/local/lib/php # # Doxygen -RUN apt install -y doxygen graphviz +RUN apt-get install -y doxygen graphviz # # Client-side `version` command # -RUN apt install -y pipx +RUN apt-get install -y pipx USER @DOCKER_FINANCE_USER@ WORKDIR /home/@DOCKER_FINANCE_USER@ diff --git a/client/Dockerfiles/finance/Dockerfile.ubuntu.in b/client/Dockerfiles/finance/Dockerfile.ubuntu.in index 0fd38b7..1b2011a 100644 --- a/client/Dockerfiles/finance/Dockerfile.ubuntu.in +++ b/client/Dockerfiles/finance/Dockerfile.ubuntu.in @@ -40,9 +40,9 @@ RUN chown root:wheel /usr/local/* && chmod g+rwx /usr/local/* # Package dependencies # -RUN apt update -y +RUN apt-get update -y -RUN apt install -y \ +RUN apt-get install -y \ gawk \ git \ hledger \ @@ -53,7 +53,7 @@ RUN apt install -y \ visidata \ zlib1g-dev -RUN apt install -y cargo +RUN apt-get install -y cargo RUN cargo install xsv --root /usr USER @DOCKER_FINANCE_USER@ @@ -66,7 +66,7 @@ RUN pipx install csvkit # USER root -RUN apt install -y \ +RUN apt-get install -y \ bc \ composer \ php \ diff --git a/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.bin.in b/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.bin.in index 45a03e6..0a78167 100644 --- a/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.bin.in +++ b/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.bin.in @@ -20,7 +20,7 @@ # USER root -RUN apt install -y curl +RUN apt-get install -y curl USER builder WORKDIR /usr/local/src diff --git a/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in b/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in index e8ca181..282f657 100644 --- a/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in +++ b/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in @@ -21,7 +21,7 @@ USER root -RUN apt install -y \ +RUN apt-get install -y \ ghc \ haskell-stack diff --git a/client/Dockerfiles/finance/ubuntu/Dockerfile.root.in b/client/Dockerfiles/finance/ubuntu/Dockerfile.root.in index 6db98ec..f6aec55 100644 --- a/client/Dockerfiles/finance/ubuntu/Dockerfile.root.in +++ b/client/Dockerfiles/finance/ubuntu/Dockerfile.root.in @@ -22,7 +22,7 @@ USER root # ROOT.cern dependencies (regardless of building or not) -RUN apt install -y \ +RUN apt-get install -y \ binutils \ cmake \ dpkg-dev \ @@ -37,7 +37,7 @@ RUN apt install -y \ python3 # ROOT.cern pre-compiled installation -RUN apt install -y curl +RUN apt-get install -y curl USER builder WORKDIR /usr/local/src RUN curl --location -O "https://root.cern/download/root_v6.32.02.Linux-ubuntu24.04-x86_64-gcc13.2.tar.gz" @@ -61,7 +61,7 @@ RUN echo "export PATH=\"\$PATH::/usr/local/src/root/bin\"" | tee -a ~/.bash_alia # docker-finance USER root -RUN apt install -y \ +RUN apt-get install -y \ botan \ googletest \ libbenchmark-dev \ 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 f68e032..e2a9746 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 @@ -21,9 +21,9 @@ USER root -RUN apt update -y +RUN apt-get update -y -RUN apt install -y \ +RUN apt-get install -y \ curl \ yq 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 490d1d3..0b18004 100644 --- a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in +++ b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in @@ -25,9 +25,9 @@ USER root -RUN apt update -y +RUN apt-get update -y -RUN apt install -y \ +RUN apt-get install -y \ calc \ emacs-nox \ mc \