Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ object CloudflowAkkaPlugin extends AutoPlugin {

override def projectSettings =
Seq(
cloudflowAkkaBaseImage := None,
libraryDependencies ++= Vector(
"com.lightbend.cloudflow" % s"cloudflow-akka-util_${(ThisProject / scalaBinaryVersion).value}" % (ThisProject / cloudflowVersion).value,
"com.lightbend.cloudflow" % s"cloudflow-akka_${(ThisProject / scalaBinaryVersion).value}" % (ThisProject / cloudflowVersion).value,
Expand Down Expand Up @@ -116,27 +115,10 @@ object CloudflowAkkaPlugin extends AutoPlugin {
// this triggers side-effects, e.g. files being created in the staging area
cloudflowStageAppJars.value

cloudflowAkkaBaseImage.value match {
case Some(baseImage) =>
log.warn("'cloudflowAkkaBaseImage' is defined, 'cloudflowDockerBaseImage' setting is going to be ignored")

val appDir: File = stage.value
val appJarsDir: File = new File(appDir, AppJarsDir)
val depJarsDir: File = new File(appDir, DepJarsDir)

new Dockerfile {
from(baseImage)
user(UserInImage)
copy(depJarsDir, OptAppDir, chown = userAsOwner(UserInImage))
copy(appJarsDir, OptAppDir, chown = userAsOwner(UserInImage))
addInstructions(extraDockerInstructions.value)
}
case _ =>
new Dockerfile {
from(cloudflowDockerBaseImage.value)
addInstructions((ThisProject / baseDockerInstructions).value)
addInstructions((ThisProject / extraDockerInstructions).value)
}
new Dockerfile {
from(cloudflowDockerBaseImage.value)
addInstructions((ThisProject / baseDockerInstructions).value)
addInstructions((ThisProject / extraDockerInstructions).value)
}
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ import cloudflow.blueprint.StreamletDescriptor

/**
* Base class for all Cloudflow runtime plugins for multi-image use case. Contains some
* methods which are reused across the runtime plugins, `CloudflowFlinkPlugin`,
* `CloudflowAkkaPlugin` and `CloudflowSparkPlugin`.
* methods which are reused across the runtime plugins.
*/
object CloudflowBasePlugin extends AutoPlugin {
final val AppHome = "${app_home}"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@ trait CloudflowSettingKeys {
}

val cloudflowDockerBaseImage = settingKey[String]("The base Docker image to use for Cloudflow images.")
@deprecated("Use 'cloudflowDockerBaseImage' instead")
val cloudflowFlinkBaseImage = settingKey[Option[String]]("The base image for Cloudflow Flink plugin")
@deprecated("Use 'cloudflowDockerBaseImage' instead")
val cloudflowSparkBaseImage = settingKey[Option[String]]("The base image for Cloudflow Spark plugin")
@deprecated("Use 'cloudflowDockerBaseImage' instead")
val cloudflowAkkaBaseImage = settingKey[Option[String]]("The base image for Cloudflow Akka plugin")
val cloudflowVersion =
settingKey[String]("The version of Cloudflow, for development purposes, change it at your own risk")
val blueprint = settingKey[Option[String]]("The path to the blueprint file to use in this Cloudflow application.")
Expand Down
Loading