From 3a4ccf56266c264b4de092c4e0a348efe9b65e01 Mon Sep 17 00:00:00 2001 From: George Oastler Date: Wed, 14 Aug 2024 14:56:36 +0100 Subject: [PATCH] fix ci image dep ordering --- docker/ci.dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/ci.dockerfile b/docker/ci.dockerfile index 785656742f..6b3b767f69 100644 --- a/docker/ci.dockerfile +++ b/docker/ci.dockerfile @@ -6,19 +6,20 @@ SHELL [ "/bin/bash", "-euxo", "pipefail", "-c" ] VOLUME /repo WORKDIR /repo -# Install dependencies -RUN apt-get update && apt-get install -y --no-install-recommends gnupg git curl pipx npm python3.8 python3-pip python3.8-venv shellcheck yamllint debian-keyring debian-archive-keyring apt-transport-https +RUN apt-get update +RUN apt-get install -y curl gnupg debian-keyring debian-archive-keyring apt-transport-https RUN curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg RUN curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list RUN apt-get update -RUN apt install -y --no-install-recommends caddy -RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.0/install.sh | bash +RUN apt-get install --no-install-recommends -y git pipx npm python3.8 python3-pip python3.8-venv shellcheck yamllint caddy + +# RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.0/install.sh | bash -RUN pipx install ansible-core --force && pipx ensurepath --force +# RUN pipx install ansible-core --force && pipx ensurepath --force -RUN pip install ruff +# RUN pip install ruff RUN rm -rf /var/lib/apt/lists/*