From 1dc74e194e375b77875e8d58f9e96178043cddd0 Mon Sep 17 00:00:00 2001
From: Marco Ferrari <ferrari.marco@gmail.com>
Date: Mon, 25 Dec 2023 12:41:40 +0100
Subject: [PATCH] build: install clj-kondo from its container image (#5064)

Instead of providing a script to install clj-kondo, grab it from its
container image so that we can benefit from automated dependency
updates.
---
 Dockerfile                   | 13 ++++++-------
 scripts/install-clj-kondo.sh |  9 ---------
 2 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100755 scripts/install-clj-kondo.sh

diff --git a/Dockerfile b/Dockerfile
index abe226ba..64a72cbd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,6 +27,7 @@ FROM rhysd/actionlint:1.6.26 as actionlint
 FROM scalameta/scalafmt:v3.7.17 as scalafmt
 FROM zricethezav/gitleaks:v8.18.1 as gitleaks
 FROM yoheimuta/protolint:0.47.3 as protolint
+FROM ghcr.io/clj-kondo/clj-kondo:2023.05.18-alpine as clj-kondo
 
 FROM python:3.12.1-alpine3.19 as base_image
 
@@ -215,6 +216,11 @@ ARG GLIBC_VERSION
 COPY scripts/install-glibc.sh /
 RUN --mount=type=secret,id=GITHUB_TOKEN /install-glibc.sh && rm -rf /install-glibc.sh
 
+#####################
+# Install clj-kondo #
+#####################
+COPY --from=clj-kondo /bin/clj-kondo /usr/bin/
+
 #################
 # Install Lintr #
 #################
@@ -242,13 +248,6 @@ WORKDIR /
 COPY scripts/install-phive.sh /
 RUN /install-phive.sh && rm -rf /install-phive.sh
 
-#####################
-# Install clj-kondo #
-#####################
-ARG CLJ_KONDO_VERSION='2023.05.18'
-COPY scripts/install-clj-kondo.sh /
-RUN /install-clj-kondo.sh && rm -rf /install-clj-kondo.sh
-
 ##################
 # Install ktlint #
 ##################
diff --git a/scripts/install-clj-kondo.sh b/scripts/install-clj-kondo.sh
deleted file mode 100755
index b9b50f31..00000000
--- a/scripts/install-clj-kondo.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-curl -sLO https://raw.githubusercontent.com/clj-kondo/clj-kondo/master/script/install-clj-kondo
-
-chmod +x install-clj-kondo
-
-./install-clj-kondo --dir /usr/bin/ --download-dir /usr/bin/ --version "${CLJ_KONDO_VERSION}"