From 42e3226ef7301ea09035dd488fc7d8b569d86509 Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Tue, 4 Jan 2022 08:08:34 -0800 Subject: [PATCH] Use cross-platform env --- build.sbt | 6 ++++-- .../src/main/scala/io/chrisdavenport/whaletail/Docker.scala | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 8a386f3..98abbb3 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,9 @@ lazy val core = crossProject(JSPlatform, JVMPlatform) name := "whale-tail" ) .jvmSettings( - libraryDependencies += "com.github.jnr" % "jnr-unixsocket" % "0.38.15" % Test, + libraryDependencies ++= Seq( + "com.github.jnr" % "jnr-unixsocket" % "0.38.15" % Test, + ) ) .jsSettings( scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule)}, @@ -90,10 +92,10 @@ lazy val commonSettings = Seq( "io.circe" %%% "circe-core" % circeV, "io.circe" %%% "circe-generic" % circeV, "io.circe" %%% "circe-parser" % circeV, + "io.chrisdavenport" %%% "env" % "0.1.0", "org.typelevel" %%% "log4cats-core" % log4catsV, "org.typelevel" %%% "log4cats-testing" % log4catsV % Test, - "org.typelevel" %%% "cats-effect-testing-specs2" % "1.4.0" % Test, ) diff --git a/core/src/main/scala/io/chrisdavenport/whaletail/Docker.scala b/core/src/main/scala/io/chrisdavenport/whaletail/Docker.scala index a3905da..77607ce 100644 --- a/core/src/main/scala/io/chrisdavenport/whaletail/Docker.scala +++ b/core/src/main/scala/io/chrisdavenport/whaletail/Docker.scala @@ -17,7 +17,7 @@ import scodec.bits.ByteVector import org.http4s.ember.client.EmberClientBuilder import fs2.io.net.unixsocket.UnixSocketAddress import org.http4s.client.middleware.UnixSocket - +import io.chrisdavenport.env.Env object Docker { @@ -56,7 +56,7 @@ object Docker { * tcp://0.0.0.0:2375 */ def default[F[_]: Async]: Resource[F, Client[F]] = for { - baseUriSOpt <- Resource.eval(Sync[F].delay(sys.env.get("DOCKER_HOST"))) + baseUriSOpt <- Resource.eval(Env.make[F].get("DOCKER_HOST")) base <- Resource.eval(baseUriSOpt.traverse(parseConnection[F])) out <- base match { case Some(Left(baseUri)) => tcp(baseUri)