Skip to content

Commit

Permalink
build: install clj-kondo from its container image (#5064)
Browse files Browse the repository at this point in the history
Instead of providing a script to install clj-kondo, grab it from its
container image so that we can benefit from automated dependency
updates.
  • Loading branch information
ferrarimarco committed Dec 25, 2023
1 parent 69a45e0 commit 1dc74e1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 16 deletions.
13 changes: 6 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 #
#################
Expand Down Expand Up @@ -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 #
##################
Expand Down
9 changes: 0 additions & 9 deletions scripts/install-clj-kondo.sh

This file was deleted.

0 comments on commit 1dc74e1

Please sign in to comment.