From dd3fce2857092ee8d50b6696cfe6423af288c92c Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 3 Aug 2024 23:27:17 +0300
Subject: [PATCH] pre-commit: Use the toolbx image as a base.
Already has the different Debian sources and more of the expected
utilities.
---
images/pre-commit/Dockerfile | 8 +++-----
images/pre-commit/sources.d/hashicorp.sources | 5 -----
2 files changed, 3 insertions(+), 10 deletions(-)
delete mode 100644 images/pre-commit/sources.d/hashicorp.sources
diff --git a/images/pre-commit/Dockerfile b/images/pre-commit/Dockerfile
index 55e50ba..ccc3a1b 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 f01300c..0000000
--- 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
--
GitLab