Skip to content

Commit

Permalink
Upgrade KOTLIN_DETEKT and make it work with cli_lint_mode = project (#…
Browse files Browse the repository at this point in the history
…3590)

* Deetekt: add -i as last argument before file name

Fixes #3579

* Upgrade Kotlin and make it with cli_lint_mode = project

* test folder

* changelog
  • Loading branch information
nvuillam authored May 28, 2024
1 parent c0409fa commit 75d7a20
Show file tree
Hide file tree
Showing 24 changed files with 23,571 additions and 23,536 deletions.
4 changes: 4 additions & 0 deletions .automation/test/kotlin_detekt/bad/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
root = true

[*.kt]
ktlint_standard_filename = disabled
13 changes: 13 additions & 0 deletions .automation/test/kotlin_detekt/bad/Kotlin_bad_1.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
abstract internal class A {
open protected val v = ""
open suspend internal fun f(v: Any): Any = ""
lateinit public var lv: String
tailrec abstract fun findFixPoint(x: Double = 1.0): Double
}

class B : A() {
override public val v = ""
override suspend fun f(v: Any): Any = ""
override tailrec fun findFixPoint(x: Double): Double
= if (x == Math.cos(x)) x else findFixPoint(Math.cos(x))
}
4 changes: 4 additions & 0 deletions .automation/test/kotlin_detekt/good/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
root = true

[*.kt]
ktlint_standard_filename = disabled
7 changes: 7 additions & 0 deletions .automation/test/kotlin_detekt/good/Kotlin_good_1.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* You can edit, run, and share this code.
* play.kotlinlang.org
*/
fun main() {
println("Hello, world!!!")
}
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
- Disable SQL_TSQLLINT until security issues are solved. Related to <https://github.com/tsqllint/tsqllint/issues/333>
- PHP linters (PHP_PHPCS, PHP_PHPLINT, PHP_PHPSTAN) add support to SARIF report output format with help of <https://github.com/llaville/sarif-php-sdk>
- `KOTLIN_KTLINT` now supports `list_of_files` mode, and has better error counting
- Upgrade `KOTLIN_DETEKT` and make it work with cli_lint_mode = project

- Reporters

Expand Down
13 changes: 7 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ ARG BICEP_URI='https://github.com/Azure/bicep/releases/latest/download/bicep-lin
ARG BICEP_DIR='/usr/local/bin'
ARG DART_VERSION='2.8.4'
ARG PMD_VERSION=7.1.0
ARG VERSION_KOTLIN_DETEKT='1.23.6'
ARG PSSA_VERSION='latest'
#ARG__END

Expand Down Expand Up @@ -586,12 +587,12 @@ RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${P
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
14 changes: 7 additions & 7 deletions flavors/c_cpp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ FROM python:3.12.3-alpine3.19
## @generated by .automation/build.py using descriptor files, please do not update manually ##
#############################################################################################
#ARG__START

ARG VERSION_KOTLIN_DETEKT='1.23.6'
#ARG__END

# Static args
Expand Down Expand Up @@ -266,12 +266,12 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
13 changes: 7 additions & 6 deletions flavors/cupcake/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ FROM python:3.12.3-alpine3.19
#############################################################################################
#ARG__START
ARG PMD_VERSION=7.1.0
ARG VERSION_KOTLIN_DETEKT='1.23.6'
#ARG__END

# Static args
Expand Down Expand Up @@ -435,12 +436,12 @@ RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${P
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
14 changes: 7 additions & 7 deletions flavors/documentation/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ FROM python:3.12.3-alpine3.19
## @generated by .automation/build.py using descriptor files, please do not update manually ##
#############################################################################################
#ARG__START

ARG VERSION_KOTLIN_DETEKT='1.23.6'
#ARG__END

# Static args
Expand Down Expand Up @@ -264,12 +264,12 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
13 changes: 7 additions & 6 deletions flavors/dotnet/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ ARG ARM_TTK_DIRECTORY='/opt/microsoft'
ARG BICEP_EXE='bicep'
ARG BICEP_URI='https://github.com/Azure/bicep/releases/latest/download/bicep-linux-musl-x64'
ARG BICEP_DIR='/usr/local/bin'
ARG VERSION_KOTLIN_DETEKT='1.23.6'
ARG PSSA_VERSION='latest'
#ARG__END

Expand Down Expand Up @@ -319,12 +320,12 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
13 changes: 7 additions & 6 deletions flavors/dotnetweb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ ARG ARM_TTK_DIRECTORY='/opt/microsoft'
ARG BICEP_EXE='bicep'
ARG BICEP_URI='https://github.com/Azure/bicep/releases/latest/download/bicep-linux-musl-x64'
ARG BICEP_DIR='/usr/local/bin'
ARG VERSION_KOTLIN_DETEKT='1.23.6'
ARG PSSA_VERSION='latest'
#ARG__END

Expand Down Expand Up @@ -341,12 +342,12 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
14 changes: 7 additions & 7 deletions flavors/go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ FROM python:3.12.3-alpine3.19
## @generated by .automation/build.py using descriptor files, please do not update manually ##
#############################################################################################
#ARG__START

ARG VERSION_KOTLIN_DETEKT='1.23.6'
#ARG__END

# Static args
Expand Down Expand Up @@ -280,12 +280,12 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
13 changes: 7 additions & 6 deletions flavors/java/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ FROM python:3.12.3-alpine3.19
#############################################################################################
#ARG__START
ARG PMD_VERSION=7.1.0
ARG VERSION_KOTLIN_DETEKT='1.23.6'
#ARG__END

# Static args
Expand Down Expand Up @@ -337,12 +338,12 @@ RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${P
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
14 changes: 7 additions & 7 deletions flavors/javascript/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ FROM python:3.12.3-alpine3.19
## @generated by .automation/build.py using descriptor files, please do not update manually ##
#############################################################################################
#ARG__START

ARG VERSION_KOTLIN_DETEKT='1.23.6'
#ARG__END

# Static args
Expand Down Expand Up @@ -288,12 +288,12 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
14 changes: 7 additions & 7 deletions flavors/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ FROM python:3.12.3-alpine3.19
## @generated by .automation/build.py using descriptor files, please do not update manually ##
#############################################################################################
#ARG__START

ARG VERSION_KOTLIN_DETEKT='1.23.6'
#ARG__END

# Static args
Expand Down Expand Up @@ -298,12 +298,12 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
14 changes: 7 additions & 7 deletions flavors/python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ FROM python:3.12.3-alpine3.19
## @generated by .automation/build.py using descriptor files, please do not update manually ##
#############################################################################################
#ARG__START

ARG VERSION_KOTLIN_DETEKT='1.23.6'
#ARG__END

# Static args
Expand Down Expand Up @@ -276,12 +276,12 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
14 changes: 7 additions & 7 deletions flavors/ruby/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ FROM python:3.12.3-alpine3.19
## @generated by .automation/build.py using descriptor files, please do not update manually ##
#############################################################################################
#ARG__START

ARG VERSION_KOTLIN_DETEKT='1.23.6'
#ARG__END

# Static args
Expand Down Expand Up @@ -270,12 +270,12 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
14 changes: 7 additions & 7 deletions flavors/rust/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ FROM python:3.12.3-alpine3.19
## @generated by .automation/build.py using descriptor files, please do not update manually ##
#############################################################################################
#ARG__START

ARG VERSION_KOTLIN_DETEKT='1.23.6'
#ARG__END

# Static args
Expand Down Expand Up @@ -264,12 +264,12 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel
mv "ktlint" /usr/bin/ \

# detekt installation
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v1.23.5/detekt-cli-1.23.5.zip && \
unzip detekt-cli-1.23.5.zip && \
chmod a+x detekt-cli-1.23.5/bin/* && \
chmod a+x detekt-cli-1.23.5/lib/* && \
mv -n detekt-cli-1.23.5/bin/* usr/bin && \
mv -n detekt-cli-1.23.5/lib/* usr/lib \
&& curl --retry 5 --retry-delay 5 -sSLO https://github.com/detekt/detekt/releases/download/v${VERSION_KOTLIN_DETEKT}/detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
unzip detekt-cli-${VERSION_KOTLIN_DETEKT}.zip && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* && \
chmod a+x detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/bin/* usr/bin && \
mv -n detekt-cli-${VERSION_KOTLIN_DETEKT}/lib/* usr/lib \

# kubeconform installation
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
Expand Down
Loading

0 comments on commit 75d7a20

Please sign in to comment.