docker ci

AbsaOSS · Feb 13, 2024 · 8d4a071 · 8d4a071
1 parent 31e7c4a
commit 8d4a071
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
@@ -63,4 +63,4 @@ jobs:
           docker run -d -p 8080:8080 absaoss/atum-service:latest
           docker container ls
           sleep 15  # Wait for the service to start
-          curl -Lf http://localhost:8080/docs
+          curl -Lf http://127.0.0.1:8080/docs
diff --git a/build.sbt b/build.sbt
@@ -40,13 +40,6 @@ lazy val commonSettings = Seq(
   jacocoExcludes := jacocoProjectExcludes()
 )
 
-//val mergeStrategy = assembly / assemblyMergeStrategy := {
-//  case PathList("META-INF", _) => MergeStrategy.discard
-//  case "application.conf"      => MergeStrategy.concat
-//  case "reference.conf"        => MergeStrategy.concat
-//  case _                       => MergeStrategy.first
-//}
-
 val serverMergeStrategy = assembly / assemblyMergeStrategy := {
   case PathList("META-INF", "services", xs @ _*) => MergeStrategy.filterDistinctLines
   case PathList("META-INF", "maven", "org.webjars", "swagger-ui", "pom.properties") => MergeStrategy.singleOrError

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -49,7 +49,7 @@ object Dependencies {
     val sttp = "3.5.2"
 
     val postgresql = "42.6.0"
-    
+
     val fadb = "0.3.0"
 
     val json4s_spark2 = "3.5.3"
@@ -64,7 +64,7 @@ object Dependencies {
     val sbtJunitInterface = "0.13.3"
     val tapir = "1.9.6"
     val http4sBlazeBackend = "0.23.15"
-    val playJson = "3.0.1"//"2.9.4"
+    val playJson = "3.0.1"
 
   }
 
@@ -120,19 +120,12 @@ object Dependencies {
     lazy val json4sJackson = "org.json4s" %% "json4s-jackson" % json4sVersion
     lazy val json4sNative = "org.json4s" %% "json4s-native" % json4sVersion % Provided
 
-//    lazy val logback = "ch.qos.logback" % "logback-classic" % Versions.logback
-//    lazy val scalatest = "org.scalatest" %% "scalatest" % Versions.scalatest % Test
-//    lazy val mockito = "org.mockito" %% "mockito-scala" % Versions.scalaMockito % Test
-
     Seq(
       jacksonModuleScala,
       json4sExt,
       json4sCore,
       json4sJackson,
-      json4sNative,
-//      logback,
-//      scalatest,
-//      mockito,
+      json4sNative
     )
   }
 
@@ -239,7 +232,7 @@ object Dependencies {
       balta,
     )
   }
-  
+
   def flywayDependencies: Seq[ModuleID] = {
     val postgresql = "org.postgresql" % "postgresql" % Versions.postgresql
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -27,7 +27,6 @@ addSbtPlugin("io.github.davidmweber" % "flyway-sbt" % "7.4.0")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 
 // Plugins to build the server module as a war file
-//addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
 
 // sbt-jacoco dependency downloading
@@ -48,4 +47,3 @@ addSbtPlugin("org.ow2.asm" % "asm-commons" % ow2Version from ow2Url("asm-commons
 addSbtPlugin("org.ow2.asm" % "asm-tree" % ow2Version from ow2Url("asm-tree"))
 
 addSbtPlugin("za.co.absa.sbt" % "sbt-jacoco" % "3.4.1-absa.4" from "https://github.com/AbsaOSS/sbt-jacoco/releases/download/3.4.1-absa.4/sbt-jacoco-3.4.1-absa.4.jar")
-