Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade alpine, java, kafka, circe and grafter versions #51

Merged
merged 5 commits into from
Mar 19, 2021
Merged

Upgrade alpine, java, kafka, circe and grafter versions #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
263b641
update docker base
r-glyde Mar 18, 2021
0fdb25b
update circe
r-glyde Mar 18, 2021
521c60c
update grafter
r-glyde Mar 18, 2021
10afad7
update kafka
r-glyde Mar 18, 2021
ef2a107
switch user
r-glyde Mar 18, 2021
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
10 changes: 5 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import BuildInfo._
import Release._
import Docker._

val kafkaVersion = "1.1.0"
val kafkaVersion = "2.3.1"

val kafkaDeps = Seq(
"org.apache.kafka" % "kafka-clients",
Expand All @@ -13,10 +13,10 @@ val kafkaDeps = Seq(

val dependencies = Seq(
"com.github.scopt" %% "scopt" % "3.7.1",
"org.zalando" %% "grafter" % "1.6.0",
"org.zalando" %% "grafter" % "2.6.1",
"com.typesafe.scala-logging" %% "scala-logging" % "3.5.0",
"io.circe" %% "circe-yaml" % "0.12.0",
"io.circe" %% "circe-generic" % "0.12.3",
"io.circe" %% "circe-yaml" % "0.13.1",
"io.circe" %% "circe-generic" % "0.13.0",
"org.typelevel" %% "cats-core" % "1.5.0",
"org.typelevel" %% "cats-kernel" % "1.5.0",
"org.slf4j" % "log4j-over-slf4j" % "1.7.25",
Expand All @@ -29,7 +29,7 @@ val dependencies = Seq(
) ++ kafkaDeps

val root = (project in file("."))
.enablePlugins(BuildInfoPlugin, JavaAppPackaging, UniversalDeployPlugin, DockerPlugin)
.enablePlugins(BuildInfoPlugin, JavaAppPackaging, UniversalDeployPlugin, DockerPlugin, AshScriptPlugin)
.settings(
defineCommandAliases,
organization := "com.sky",
Expand Down
4 changes: 2 additions & 2 deletions project/Docker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ object Docker {

lazy val dockerSettings = Seq(
packageName in docker := packageName.value,
dockerBaseImage := "openjdk:8u131-jre-alpine",
dockerBaseImage := "alpine:3.13.0",
dockerUpdateLatest := updateLatest.value,
dockerRepository := Some("skyuk"),
dockerCommands ++= Seq(
Cmd("USER", "root"),
Cmd("RUN", "apk update && apk add bash")
Cmd("RUN", "apk add --no-cache openjdk11-jre")
)
)

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/sky/kafka/configurator/Main.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ object Main extends LazyLogging {
}

private def stop(app: KafkaConfiguratorApp): Unit =
Rewriter.stop(app).value.foreach {
Rewriter.stopAll(app).value.foreach {
case StopOk(msg) => logger.debug(s"Component stopped: $msg")
case StopError(msg, ex) => logger.warn(s"Error whilst stopping component: $msg", ex)
case StopFailure(msg) => logger.warn(s"Failure whilst stopping component: $msg")
Expand Down