From 2a389648f42ceb560f6d6f4269e49a3f819c70a2 Mon Sep 17 00:00:00 2001
From: Benjamin Benoist <benjamin.benoist@snowplowanalytics.com>
Date: Mon, 25 Oct 2021 14:23:43 +0200
Subject: [PATCH] Change docker base image to adoptopenjdk:11-jre-hotspot-focal
 (close #512)

---
 build.sbt                   | 10 +++++-----
 project/BuildSettings.scala | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.sbt b/build.sbt
index 656d51040..bae5cbb24 100644
--- a/build.sbt
+++ b/build.sbt
@@ -107,7 +107,7 @@ 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(Docker / packageName := "stream-enrich-kinesis")
   .settings(libraryDependencies ++= Seq(
     Dependencies.Libraries.kinesisClient,
     Dependencies.Libraries.kinesisSdk,
@@ -123,7 +123,7 @@ lazy val streamKafka = project
   .settings(moduleName := "snowplow-stream-enrich-kafka")
   .settings(allStreamSettings)
   .settings(
-    Docker / packageName := "snowplow/stream-enrich-kafka",
+    Docker / packageName := "stream-enrich-kafka",
   )
   .settings(libraryDependencies ++= Seq(
     Dependencies.Libraries.kafkaClients
@@ -137,7 +137,7 @@ lazy val streamNsq = project
   .settings(moduleName := "snowplow-stream-enrich-nsq")
   .settings(allStreamSettings)
   .settings(
-    Docker / packageName := "snowplow/stream-enrich-nsq",
+    Docker / packageName := "stream-enrich-nsq",
   )
   .settings(libraryDependencies ++= Seq(
     Dependencies.Libraries.log4j,
@@ -272,7 +272,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 +299,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(
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
index efdd7997e..bbefabc12 100644
--- a/project/BuildSettings.scala
+++ b/project/BuildSettings.scala
@@ -128,12 +128,12 @@ object BuildSettings {
   /** Docker settings, used by SE */
   lazy val dockerSettings = Seq(
     Docker / maintainer := "Snowplow Analytics Ltd. <support@snowplowanalytics.com>",
-    dockerBaseImage := "snowplow/base-debian:0.2.1",
-    Docker / daemonUser := "snowplow",
-    dockerUpdateLatest := true,
-    dockerVersion := Some(DockerVersion(18, 9, 0, Some("ce"))),
+    dockerBaseImage := "adoptopenjdk:11-jre-hotspot-focal",
+    dockerRepository := Some("snowplow"),
+    Docker / daemonUser := "daemon",
     Docker / daemonUserUid := None,
-    Docker / defaultLinuxInstallLocation := "/home/snowplow" // must be home directory of daemonUser
+    Docker / defaultLinuxInstallLocation := "/opt/snowplow",
+    dockerUpdateLatest := true
   )
 
   /** Docker settings, used by BE */