Change docker base image to adoptopenjdk:11-jre-hotspot-focal (close #…

…512)

build.sbt

@@ -73,7 +73,7 @@ lazy val common = project
   .settings(excludeDependencies ++= Dependencies.Libraries.exclusions)
 
 lazy val allStreamSettings = BuildSettings.basicSettings ++ BuildSettings.sbtAssemblySettings ++
-  BuildSettings.dockerSettings ++ BuildSettings.formatting ++
+  BuildSettings.formatting ++
   Seq(libraryDependencies ++= Seq(
     Dependencies.Libraries.config,
     Dependencies.Libraries.sentry,
@@ -107,7 +107,8 @@ lazy val streamKinesis = project
   .in(file("modules/stream/kinesis"))
   .settings(allStreamSettings)
   .settings(moduleName := "snowplow-stream-enrich-kinesis")
-  .settings(Docker / packageName := "snowplow/stream-enrich-kinesis")
+  .settings(BuildSettings.dockerSettings)
+  .settings(Docker / packageName := "stream-enrich-kinesis")
   .settings(libraryDependencies ++= Seq(
     Dependencies.Libraries.kinesisClient,
     Dependencies.Libraries.kinesisSdk,
@@ -122,9 +123,8 @@ lazy val streamKafka = project
   .in(file("modules/stream/kafka"))
   .settings(moduleName := "snowplow-stream-enrich-kafka")
   .settings(allStreamSettings)
-  .settings(
-    Docker / packageName := "snowplow/stream-enrich-kafka",
-  )
+  .settings(BuildSettings.dockerSettings)
+  .settings(Docker / packageName := "stream-enrich-kafka")
   .settings(libraryDependencies ++= Seq(
     Dependencies.Libraries.kafkaClients
   ))
@@ -136,9 +136,8 @@ lazy val streamNsq = project
   .in(file("modules/stream/nsq"))
   .settings(moduleName := "snowplow-stream-enrich-nsq")
   .settings(allStreamSettings)
-  .settings(
-    Docker / packageName := "snowplow/stream-enrich-nsq",
-  )
+  .settings(BuildSettings.dockerSettings)
+  .settings(Docker / packageName := "stream-enrich-nsq")
   .settings(libraryDependencies ++= Seq(
     Dependencies.Libraries.log4j,
     Dependencies.Libraries.log4jApi,
@@ -272,7 +271,7 @@ lazy val pubsub = project
     buildInfoKeys := Seq[BuildInfoKey](organization, name, version, description),
     buildInfoPackage := "com.snowplowanalytics.snowplow.enrich.pubsub.generated",
   )
-  .settings(Docker / packageName := "snowplow/snowplow-enrich-pubsub")
+  .settings(Docker / packageName := "snowplow-enrich-pubsub")
   .settings(Test / parallelExecution := false)
   .settings(
     libraryDependencies ++= Seq(
@@ -299,7 +298,7 @@ lazy val kinesis = project
     description := "High-performance app built on top of functional streams that enriches Snowplow events from Kinesis",
     buildInfoKeys := Seq[BuildInfoKey](organization, name, version, description),
     buildInfoPackage := "com.snowplowanalytics.snowplow.enrich.kinesis.generated",
-    Docker / packageName := "snowplow/snowplow-enrich-kinesis",
+    Docker / packageName := "snowplow-enrich-kinesis",
   )
   .settings(Test / parallelExecution := false)
   .settings(

project/BuildSettings.scala

@@ -23,7 +23,8 @@ import sbtdynver.DynVerPlugin.autoImport._
 import com.typesafe.sbt.SbtNativePackager.autoImport._
 import com.typesafe.sbt.packager.linux.LinuxPlugin.autoImport._
 import com.typesafe.sbt.packager.docker.DockerPlugin.autoImport._
-import com.typesafe.sbt.packager.docker.{ DockerVersion, ExecCmd }
+import com.typesafe.sbt.packager.docker.{DockerVersion, ExecCmd}
+import com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport._
 
 import scoverage.ScoverageKeys._
 
@@ -128,12 +129,11 @@ object BuildSettings {
   /** Docker settings, used by SE */
   lazy val dockerSettings = Seq(
     Docker / maintainer := "Snowplow Analytics Ltd. <[email protected]>",
-    dockerBaseImage := "snowplow/base-debian:0.2.1",
+    dockerBaseImage := "adoptopenjdk:11-jre-hotspot-focal",
+    dockerRepository := Some("snowplow"),
     Docker / daemonUser := "snowplow",
-    dockerUpdateLatest := true,
-    dockerVersion := Some(DockerVersion(18, 9, 0, Some("ce"))),
-    Docker / daemonUserUid := None,
-    Docker / defaultLinuxInstallLocation := "/home/snowplow" // must be home directory of daemonUser
+    Docker / defaultLinuxInstallLocation := "/home/snowplow",
+    dockerUpdateLatest := true
   )
 
   /** Docker settings, used by BE */

project/plugins.sbt

@@ -1,6 +1,6 @@
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.7")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17")
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.1")