diff --git a/images/pre-commit/Dockerfile b/images/pre-commit/Dockerfile index 55e50bae76a132d5d9302bfb8053a66e23f5cfb8..ccc3a1bc712d9d8ed2a221899a3475ee34bb0525 100644 --- a/images/pre-commit/Dockerfile +++ b/images/pre-commit/Dockerfile @@ -1,10 +1,8 @@ -FROM buildpack-deps:bookworm -COPY --chown=root:root sources.d/* /etc/apt/sources.list.d/ +# hadolint ignore=DL3007 +FROM registry.shore.co.il/toolbx:latest SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008,DL3013 -RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | \ - gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/hashicorp.gpg && \ - apt-get update && \ +RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ docker.io \ python3-dev \ diff --git a/images/pre-commit/sources.d/hashicorp.sources b/images/pre-commit/sources.d/hashicorp.sources deleted file mode 100644 index f01300c8b64145a7f73aedddcda34cff8feef990..0000000000000000000000000000000000000000 --- a/images/pre-commit/sources.d/hashicorp.sources +++ /dev/null @@ -1,5 +0,0 @@ -Types: deb -URIs: https://apt.releases.hashicorp.com -Suites: buster -Components: main -Signed-By: /usr/share/keyrings/hashicorp.gpg