ansible again

prosopo · Aug 14, 2024 · 5c7eca5 · 5c7eca5
1 parent 073844a
commit 5c7eca5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/ci-image-test.yml b/.github/workflows/ci-image-test.yml
@@ -59,7 +59,7 @@ jobs:
             # - run: gh --version
             - run: pip --version
             - run: pipx --version
-            - run: ansible --version
+            # - run: ansible --version
             - run: shellcheck --version
             - run: caddy --version
             - run: yamllint --version

diff --git a/docker/ci.dockerfile b/docker/ci.dockerfile
@@ -7,22 +7,22 @@ VOLUME /repo
 WORKDIR /repo
 
 RUN apt-get update
-RUN apt-get install -y curl gnupg  debian-keyring debian-archive-keyring apt-transport-https
+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-get install -y git
-RUN apt-get install -y pipx
-RUN apt-get install -y npm
-RUN apt-get install -y python3.8
-RUN apt-get install -y python3-pip
-RUN apt-get install -y python3.8-venv
-RUN apt-get install -y shellcheck
-RUN apt-get install -y yamllint
-RUN apt-get install -y caddy
-RUN apt-get install -y wget
+RUN apt-get install -y --no-install-recommends git
+RUN apt-get install -y --no-install-recommends pipx
+RUN apt-get install -y --no-install-recommends npm
+RUN apt-get install -y --no-install-recommends python3.8
+RUN apt-get install -y --no-install-recommends python3-pip
+RUN apt-get install -y --no-install-recommends python3.8-venv
+RUN apt-get install -y --no-install-recommends shellcheck
+RUN apt-get install -y --no-install-recommends yamllint
+RUN apt-get install -y --no-install-recommends caddy
+RUN apt-get install -y --no-install-recommends wget
 RUN mkdir -p -m 755 /etc/apt/keyrings \
     && wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \
     && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
@@ -39,14 +39,16 @@ RUN echo \
     $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
     tee /etc/apt/sources.list.d/docker.list > /dev/null
 RUN apt-get update
-RUN apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+RUN apt-get install -y --no-install-recommends docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.0/install.sh | bash
 
 RUN pipx install ansible
 
 RUN pip install ruff
 
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.77
+
 RUN rm -rf /var/lib/apt/lists/*
 
 RUN echo "alias pip='pip3'" >> ~/.bashrc