From aebb019c839fc547b62305d8872e723fba0f831b Mon Sep 17 00:00:00 2001 From: ccellado Date: Sun, 17 Mar 2024 02:56:16 +0400 Subject: [PATCH] Remove old docker library Fix integration specs Deprecate OpenApiSpec --- build.sbt | 2 -- .../org/ergoplatform/it/container/IntegrationSuite.scala | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 1f0939ff35..ecda37a558 100644 --- a/build.sbt +++ b/build.sbt @@ -63,7 +63,6 @@ libraryDependencies ++= Seq( "org.asynchttpclient" % "async-http-client" % "2.6.+" % "test", "com.fasterxml.jackson.dataformat" % "jackson-dataformat-properties" % "2.9.2" % "test", -// "com.spotify" % "docker-client" % "8.14.5" % "test" classifier "shaded", "com.github.docker-java" % "docker-java-core" % "3.3.4" % Test, "com.github.docker-java" % "docker-java-transport-httpclient5" % "3.3.4" % Test, @@ -166,7 +165,6 @@ inConfig(Linux)( ) Defaults.itSettings -//lazy val ItTest = config("it") extend (IntegrationTest, Test) configs(IntegrationTest extend Test) inConfig(IntegrationTest)(Seq( parallelExecution := false, diff --git a/src/it/scala/org/ergoplatform/it/container/IntegrationSuite.scala b/src/it/scala/org/ergoplatform/it/container/IntegrationSuite.scala index acf0296248..607e472934 100644 --- a/src/it/scala/org/ergoplatform/it/container/IntegrationSuite.scala +++ b/src/it/scala/org/ergoplatform/it/container/IntegrationSuite.scala @@ -20,7 +20,9 @@ trait IntegrationSuite implicit def executionContext: ExecutionContext = ErgoTestHelpers.defaultExecutionContext - protected val localDataDir: String = s"/tmp/ergo-${Random.nextInt(Int.MaxValue)}" + val tempDir: String = System.getenv("TMPDIR") + + protected val localDataDir: String = s"$tempDir/ergo-${Random.nextInt(Int.MaxValue)}" protected val docker: Docker = new Docker(tag = getClass.getSimpleName, localDataVolumeOpt = Some(localDataDir))