wip: nixify

7mind · Oct 30, 2024 · 9950a6c · 9950a6c
1 parent 0c49f2b
commit 9950a6c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/build.sh b/build.sh
@@ -18,6 +18,7 @@ function nixify() {
       exec nix develop \
         --ignore-environment \
         --keep HOME \
+        --keep DOCKER_HOST \
         --keep CI_BRANCH \
         --keep CI_COMMIT \
         --keep CI_BRANCH_TAG \

diff --git a/...ge-framework-docker/src/main/scala/izumi/distage/docker/modules/DockerSupportModule.scala b/...ge-framework-docker/src/main/scala/izumi/distage/docker/modules/DockerSupportModule.scala
@@ -19,9 +19,17 @@ class DockerSupportModule[F[_]: TagK](configModule: ModuleBase) extends ModuleDe
   make[DefaultDockerClientConfig].from {
     (clientConfig: Docker.ClientConfig) =>
       /** We do not need to use global registry here since it would be overridden in CMD requests. */
-      val remote = clientConfig.remote.filter(_ => clientConfig.useRemote)
+      val remote = clientConfig.remote
+        .filter(_ => clientConfig.useRemote)
       Value(DefaultDockerClientConfig.createDefaultConfigBuilder())
-        .mut(remote)((b, c) => b.withDockerHost(c.host).withDockerTlsVerify(c.tlsVerify).withDockerCertPath(c.certPath).withDockerConfig(c.config))
+        .mut(remote)(
+          (builder, remoteConfig) =>
+            builder
+              .withDockerHost(remoteConfig.host)
+              .withDockerTlsVerify(remoteConfig.tlsVerify)
+              .withDockerCertPath(remoteConfig.certPath)
+              .withDockerConfig(remoteConfig.config)
+        )
         .get.build()
   }