Skip to content

Commit

Permalink
Change docker base image to adoptopenjdk:11-jre-hotspot-focal (close #…
Browse files Browse the repository at this point in the history
  • Loading branch information
benjben committed Feb 1, 2022
1 parent 274cc50 commit 2a38964
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand All @@ -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,
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand Down
10 changes: 5 additions & 5 deletions project/BuildSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ 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",
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 */
Expand Down

0 comments on commit 2a38964

Please sign in to comment.