From aab2c504e17259c57f3fc002f63f548136439f39 Mon Sep 17 00:00:00 2001 From: George Oastler Date: Wed, 14 Aug 2024 15:07:26 +0100 Subject: [PATCH] debug --- .github/workflows/ci-image-test.yml | 10 +++++----- docker/ci.dockerfile | 20 +++++++++++++++++++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-image-test.yml b/.github/workflows/ci-image-test.yml index 04d57f18ce..77c1348c7b 100644 --- a/.github/workflows/ci-image-test.yml +++ b/.github/workflows/ci-image-test.yml @@ -52,11 +52,11 @@ jobs: echo "******************************" - run: git --version - - run: npm --version - - run: node --version - - run: nvm --version - - run: docker --version - - run: gh --version + # - run: npm --version + # - run: node --version + # - run: nvm --version + # - run: docker --version + # - run: gh --version - run: pip --version - run: pipx --version - run: ansible --version diff --git a/docker/ci.dockerfile b/docker/ci.dockerfile index 6b3b767f69..41790acbba 100644 --- a/docker/ci.dockerfile +++ b/docker/ci.dockerfile @@ -13,7 +13,22 @@ RUN curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --de 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 --no-install-recommends -y git pipx npm python3.8 python3-pip python3.8-venv shellcheck yamllint caddy +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 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 \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \ + && apt-get update \ + && apt-get install gh -y # RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.0/install.sh | bash @@ -23,4 +38,7 @@ RUN apt-get install --no-install-recommends -y git pipx npm python3.8 python3-pi RUN rm -rf /var/lib/apt/lists/* +RUN echo "alias pip='pip3'" >> ~/.bashrc + + ENTRYPOINT [ "/bin/bash", "-euxo", "pipefail" ]