Merge pull request #448 from codacy/bump-docker-image-to-work-with-arm64

bump: Bump docker image to work with arm64/v8

Author: lolgab

.circleci/config.yml

@@ -176,7 +176,8 @@ workflows:
           install_sbt_version: 1.6.1
           cmd: |
             sbt "set codacyAnalysisCli / version := \"dev-snapshot\";
-                 codacyAnalysisCli/docker:publishLocal"
+                 codacyAnalysisCli/stage"
+            docker build -t $CIRCLE_PROJECT_REPONAME:dev-snapshot .
             docker save --output docker-image.tar $CIRCLE_PROJECT_REPONAME:dev-snapshot
           cache_prefix: *cache_prefix
           persist_to_workspace: true

Dockerfile

@@ -0,0 +1,7 @@
+FROM alpine:3.15.4
+RUN apk add --no-cache --update bash docker openjdk8
+WORKDIR /workdir
+COPY --chown=root:root cli/target/universal/stage /workdir
+USER root
+ENTRYPOINT ["/workdir/bin/codacy-analysis-cli"]
+CMD []

README.md

@@ -318,11 +318,9 @@ sbt codacyCoverage
 
 * **Local**
 
-        sbt 'set version in codacyAnalysisCli := "<VERSION>"' codacyAnalysisCli/docker:publishLocal
+        sbt 'codacyAnalysisCli/stage'
+        docker build -t codacy-analysis-cli .
 
-* **Release**
-
-        sbt 'set version in codacyAnalysisCli := "<VERSION>"' codacyAnalysisCli/docker:publish
 
 ### Library
 

build.sbt

@@ -65,7 +65,6 @@ lazy val codacyAnalysisCli = project
   .settings(
     name := "codacy-analysis-cli",
     coverageExcludedPackages := "<empty>;com\\.codacy\\..*CLIError.*",
-    Common.dockerSettings,
     Common.genericSettings,
     Universal / javaOptions ++= Seq("-XX:MinRAMPercentage=60.0", "-XX:MaxRAMPercentage=90.0"),
     publish := (Docker / publish).value,

cli/src/test/scala/com/codacy/analysis/cli/AnalyseExecutorSpec.scala

@@ -31,7 +31,7 @@ class AnalyseExecutorSpec extends Specification with NoLanguageFeatures with Moc
         | that ignores the files that start with the path $pathToIgnore
         | and considers just patterns ${pyLintPatternsInternalIds.mkString(", ")}""".stripMargin in {
       val commitUuid = "9232dbdcae98b19412c8dd98c49da8c391612bfa"
-      withClonedRepo("git://github.com/qamine-test/improver.git", commitUuid) { (file, directory) =>
+      withClonedRepo("git@github.com:qamine-test/improver.git", commitUuid) { (file, directory) =>
         val toolPatterns = pyLintPatternsInternalIds.map { patternId =>
           CLIConfiguration.IssuesTool.Pattern(patternId, Set.empty)
         }
@@ -79,7 +79,7 @@ class AnalyseExecutorSpec extends Specification with NoLanguageFeatures with Moc
     s"""|analyze a javascript project with eslint, using a remote project configuration retrieved with an api token
         | that considers just patterns ${esLintPatternsInternalIds.mkString(", ")}""".stripMargin in {
       val commitUuid = "9232dbdcae98b19412c8dd98c49da8c391612bfa"
-      withClonedRepo("git://github.com/qamine-test/Monogatari.git", commitUuid) { (file, directory) =>
+      withClonedRepo("git@github.com:qamine-test/Monogatari.git", commitUuid) { (file, directory) =>
         val toolPatterns = esLintPatternsInternalIds.map { patternId =>
           CLIConfiguration.IssuesTool.Pattern(patternId, Set.empty)
         }
@@ -119,7 +119,7 @@ class AnalyseExecutorSpec extends Specification with NoLanguageFeatures with Moc
 
     "analyze a javascript and css project" in {
       val commitUuid = "9232dbdcae98b19412c8dd98c49da8c391612bfa"
-      withClonedRepo("git://github.com/qamine-test/Monogatari.git", commitUuid) { (file, directory) =>
+      withClonedRepo("git@github.com:qamine-test/Monogatari.git", commitUuid) { (file, directory) =>
         val configuration = analysisConfiguration(
           directory,
           file,

cli/src/test/scala/com/codacy/analysis/cli/CLISpec.scala

@@ -128,7 +128,7 @@ class CLISpec extends Specification with NoLanguageFeatures with FileMatchers {
     }
 
     "output correct issues for sample project without remote configuration" in {
-      withClonedRepo("git://github.com/qamine-test/codacy-brakeman", "b10790d724e5fd2ca98e8ba3711b6cb10d7f5e38") {
+      withClonedRepo("git@github.com:qamine-test/codacy-brakeman", "b10790d724e5fd2ca98e8ba3711b6cb10d7f5e38") {
         (file, directory) =>
           cli.main(
             Array(
@@ -159,7 +159,7 @@ class CLISpec extends Specification with NoLanguageFeatures with FileMatchers {
 
     "output correct issues for custom python version" in {
       withClonedRepo(
-        "git://github.com/qamine-test/nci-adult-match-treatment-arm-api",
+        "git@github.com:qamine-test/nci-adult-match-treatment-arm-api",
         "38e5ab22774c6061ce693efab4011d49b8feb5ca") { (file, directory) =>
         cli.main(
           Array(
@@ -186,7 +186,7 @@ class CLISpec extends Specification with NoLanguageFeatures with FileMatchers {
     }
 
     "output correct issues for custom brakeman basedir" in {
-      withClonedRepo("git://github.com/qamine-test/codacy-brakeman", "266c56a61d236ed6ee5efa58c0e621125498dd5f") {
+      withClonedRepo("git@github.com:qamine-test/codacy-brakeman", "266c56a61d236ed6ee5efa58c0e621125498dd5f") {
         (file, directory) =>
           cli.main(
             Array(
@@ -217,7 +217,7 @@ class CLISpec extends Specification with NoLanguageFeatures with FileMatchers {
     }
 
     "output correct metrics" in {
-      withClonedRepo("git://github.com/qamine-test/codacy-brakeman", "266c56a61d236ed6ee5efa58c0e621125498dd5f") {
+      withClonedRepo("git@github.com:qamine-test/codacy-brakeman", "266c56a61d236ed6ee5efa58c0e621125498dd5f") {
         (file, directory) =>
           cli.main(
             Array(
@@ -249,7 +249,7 @@ class CLISpec extends Specification with NoLanguageFeatures with FileMatchers {
     }
 
     "output correct duplication" in {
-      withClonedRepo("git://github.com/qamine-test/duplication-delta.git", "625e19cd9be4898939a7c40dbeb2b17e40df9d54") {
+      withClonedRepo("git@github.com:qamine-test/duplication-delta.git", "625e19cd9be4898939a7c40dbeb2b17e40df9d54") {
         (file, directory) =>
           cli.main(
             Array(

core/src/test/scala/com.codacy.analysis.core/files/FileCollectorSpec.scala

@@ -344,7 +344,7 @@ abstract class FileCollectorSpec(fileCollector: FileCollector[Try]) extends Spec
         directory <- File.temporaryDirectory()
       } yield {
 
-        Process(Seq("git", "clone", "git://github.com/qamine-test/codacy-brakeman", directory.pathAsString)).!
+        Process(Seq("git", "clone", "git@github.com:qamine-test/codacy-brakeman", directory.pathAsString)).!
         Process(Seq("git", "reset", "--hard", "b10790d724e5fd2ca98e8ba3711b6cb10d7f5e38"), directory.toJava).!
 
         val emptyExclusionRules =

core/src/test/scala/com.codacy.analysis.core/tools/DuplicationToolSpec.scala

@@ -20,7 +20,7 @@ class DuplicationToolSpec extends Specification with NoLanguageFeatures {
 
     "analyze duplication on a project" in {
       val commitUuid = "625e19cd9be4898939a7c40dbeb2b17e40df9d54"
-      withClonedRepo("git://github.com/qamine-test/duplication-delta.git", commitUuid) { (_, directory) =>
+      withClonedRepo("git@github.com:qamine-test/duplication-delta.git", commitUuid) { (_, directory) =>
         val expectedClones = Seq(
           model.DuplicationClone(
             "",
@@ -50,7 +50,7 @@ class DuplicationToolSpec extends Specification with NoLanguageFeatures {
 
     "analyze duplication on a project, ignoring a file" in {
       val commitUuid = "625e19cd9be4898939a7c40dbeb2b17e40df9d54"
-      withClonedRepo("git://github.com/qamine-test/duplication-delta.git", commitUuid) { (_, directory) =>
+      withClonedRepo("git@github.com:qamine-test/duplication-delta.git", commitUuid) { (_, directory) =>
         val expectedClones = Seq(
           model.DuplicationClone(
             "",

core/src/test/scala/com.codacy.analysis.core/tools/MetricsToolSpec.scala

@@ -23,7 +23,7 @@ class MetricsToolSpec extends Specification with NoLanguageFeatures {
   "MetricsTool" should {
     "analyze metrics on a project" in {
       val commitUuid = "625e19cd9be4898939a7c40dbeb2b17e40df9d54"
-      withClonedRepo("git://github.com/qamine-test/duplication-delta.git", commitUuid) { (_, directory) =>
+      withClonedRepo("git@github.com:qamine-test/duplication-delta.git", commitUuid) { (_, directory) =>
         val testProjectFileMetrics = List(jsTest2Metrics, jsTestMetrics)
 
         val metricsTool = new MetricsTool(cloc, Languages.Javascript)
@@ -41,7 +41,7 @@ class MetricsToolSpec extends Specification with NoLanguageFeatures {
 
     "analyze metrics on a project, ignoring a file" in {
       val commitUuid = "625e19cd9be4898939a7c40dbeb2b17e40df9d54"
-      withClonedRepo("git://github.com/qamine-test/duplication-delta.git", commitUuid) { (_, directory) =>
+      withClonedRepo("git@github.com:qamine-test/duplication-delta.git", commitUuid) { (_, directory) =>
         val testProjectFileMetrics = List(jsTestMetrics)
 
         val metricsTool = new MetricsTool(cloc, Languages.Javascript)

project/Common.scala

@@ -30,20 +30,6 @@ object Common {
     scalacOptions -= "-Xfatal-warnings",
     Compile / doc / sources := Seq.empty)
 
-  val dockerSettings: Seq[Def.Setting[_]] = Seq(
-    Docker / packageName := packageName.value,
-    Docker / version := version.value,
-    dockerBaseImage := "openjdk:8-jre-alpine",
-    Docker / defaultLinuxInstallLocation := defaultDockerInstallationPath,
-    Docker / daemonUser := "root",
-    dockerEntrypoint := Seq(s"$defaultDockerInstallationPath/bin/${name.value}"),
-    dockerCmd := Seq(),
-    dockerCommands := dockerCommands.value.flatMap {
-      case cmd @ Cmd("WORKDIR", _) =>
-        Seq(Cmd("RUN", "apk add --no-cache --update bash docker"), cmd)
-      case other => List(other)
-    })
-
   val compilerFlagsDefault: Seq[String] = Seq(
     "-deprecation", // Emit warning and location for usages of deprecated APIs.
     "-encoding",