Minor improvements (#2210)

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 \

devops/.env.sh

@@ -3,7 +3,6 @@
 set -e
 set -x
 
-export _JAVA_OPTIONS="-Xmx4000M -XX:ReservedCodeCacheSize=384M -XX:NonProfiledCodeHeapSize=256M -XX:MaxMetaspaceSize=1024M"
 
 export SCALA212=$(cat project/Deps.sc | grep 'val scala212 ' |  sed -r 's/.*\"(.*)\".**/\1/')
 export SCALA213=$(cat project/Deps.sc | grep 'val scala213 ' |  sed -r 's/.*\"(.*)\".**/\1/')
@@ -25,3 +24,19 @@ export VERSION_COMMAND="++ $SCALA_VERSION"
 JDK_VERSION_VAR="JDK${JAVA_VERSION}"
 export JAVA_HOME="${!JDK_VERSION_VAR}"
 export PATH=$JAVA_HOME/bin:$PATH
+
+
+export _JAVA_OPTIONS="
+  # JVM ignores HOME and relies on getpwuid to determine home directory
+  # That fails when we run self-hosted github agent under non-dynamic user
+  # We need that for rootless docker to work
+  -Duser.home=${HOME}
+  -Xmx4000M
+  -XX:ReservedCodeCacheSize=384M
+  -XX:NonProfiledCodeHeapSize=256M
+  -XX:MaxMetaspaceSize=1024M
+"
+
+_JAVA_OPTIONS="$(echo ${_JAVA_OPTIONS} | grep -v '#' | tr '\n' ' ' | tr -s ' ')"
+
+env

devops/coverage.sh

@@ -4,7 +4,6 @@ set -e
 set -x
 
 source ./devops/.env.sh
-printenv
 
 sbt -batch -no-colors -v \
   "$VERSION_COMMAND clean" \

devops/gen-js.sh

@@ -3,4 +3,6 @@
 set -e
 set -x
 
+source ./devops/.env.sh
+
 bash sbtgen.sc --js

devops/gen-jsonly.sh

@@ -3,4 +3,6 @@
 set -e
 set -x
 
+source ./devops/.env.sh
+
 bash sbtgen.sc --nojvm --js

devops/gen.sh

@@ -3,4 +3,6 @@
 set -e
 set -x
 
+source ./devops/.env.sh
+
 bash sbtgen.sc

devops/publish-scala.sh

@@ -4,8 +4,6 @@ set -e
 set -x
 
 source ./devops/.env.sh
-printenv
-
 source ./devops/.validate-publishing.sh
 
 [[ ! -f "$SONATYPE_SECRET" ]] && echo "SONATYPE_SECRET=$SONATYPE_SECRET is not a file" && exit 0

devops/site-publish.sh

@@ -4,8 +4,6 @@ set -e
 set -x
 
 source ./devops/.env.sh
-printenv
-
 source ./devops/.validate-publishing.sh
 
 sbt -batch -no-colors -v \

devops/site-test.sh

@@ -4,7 +4,6 @@ set -e
 set -x
 
 source ./devops/.env.sh
-printenv
 
 sbt -batch -no-colors -v \
   "project docs" \

devops/test.sh

@@ -4,7 +4,6 @@ set -e
 set -x
 
 source ./devops/.env.sh
-printenv
 
 sbt -batch -no-colors -v \
   "$VERSION_COMMAND clean" \

distage/distage-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()
   }