Skip to content

Commit ed42beb

Browse files
committed
Partially dockerised
1 parent 6a2296f commit ed42beb

File tree

3 files changed

+33
-10
lines changed

3 files changed

+33
-10
lines changed

build.sbt

+24-2
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ lazy val glanceEval = soarCrossProject("glance-eval", CrossType.Full)
345345
.settings(sjsCrossVersionPatch:_*)
346346
.enablePlugins(SbtWeb)
347347
.enablePlugins(WorkbenchPlugin)
348+
.enablePlugins(DockerPlugin)
348349

349350
lazy val glanceEvalJS = glanceEval.js
350351
.dependsOn(coreJS, glanceCoreJS)
@@ -365,14 +366,35 @@ lazy val glanceEvalJS = glanceEval.js
365366
"org.webjars" % "chartjs" % "2.1.3" / "Chart.js" minified "Chart.min.js",
366367
ProvidedJS / "react-sortable-hoc.js" minified "react-sortable-hoc.min.js" dependsOn("react-with-addons.js", "react-dom.js")
367368
),
368-
scalaJSUseMainModuleInitializer := true)
369+
scalaJSUseMainModuleInitializer := true,
370+
dockerfile in docker := {
371+
val app = (fullOptJS in Compile).value.data
372+
val appTarget = "/nginx/share/nginx/html"
373+
374+
new Dockerfile {
375+
from("nginx")
376+
copy(app, appTarget)
377+
}
378+
}
379+
)
369380

370381

371382
lazy val glanceEvalJVM = glanceEval.jvm
372383
.dependsOn(coreJVM, glanceCoreJVM, server)
373384
.settings(
374385
(resources in Compile) += (fastOptJS in (glanceEvalJS, Compile)).value.data,
375-
mainClass in Compile := Some("uk.ac.ncl.la.soar.glance.eval.server.Main"))
386+
mainClass in Compile := Some("uk.ac.ncl.la.soar.glance.eval.server.Main"),
387+
dockerfile in docker := {
388+
val fatJar: File = assembly.value
389+
val jarTarget = s"/app/${fatJar.name}"
390+
391+
new Dockerfile {
392+
from("java")
393+
add(fatJar, jarTarget)
394+
entryPoint("java", "-Xms512M -Xmx2G -jar", jarTarget)
395+
expose(8080)
396+
}
397+
})
376398
.settings(commonBackendDeps:_*)
377399
.settings(flywaySettings("glance_eval"):_*)
378400
.settings(commonAssembly("uk.ac.ncl.la.soar.glance.eval.server.Main", "soar-glance-eval.jar"))

glance-eval/jvm/src/main/scala/uk/ac/ncl/la/soar/glance/eval/server/Repositories.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ object Repositories {
4949

5050
private lazy val schema = createSchema.memoize
5151

52-
/** Init method to set up the database */
52+
/* Init method to set up the database */
5353
private val createSchema: Task[(SurveyDb, SurveyResponseDb, ClusterSessionDb, RecapSessionDb, ModuleDb, ModuleScoreDb)] = {
5454

5555
//Lazy config for memoization?

project/plugins.sbt

+8-7
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ logLevel := Level.Warn
22

33
resolvers += "Flyway" at "https://flywaydb.org/repo"
44

5-
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
6-
addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "1.5.0")
7-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
8-
addSbtPlugin("com.lihaoyi" % "workbench" % "0.3.0")
9-
addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
10-
addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.4.0")
11-
addSbtPlugin("org.flywaydb" % "flyway-sbt" % "4.2.0")
5+
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
6+
addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "1.5.0")
7+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
8+
addSbtPlugin("com.lihaoyi" % "workbench" % "0.3.0")
9+
addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
10+
addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.4.0")
11+
addSbtPlugin("org.flywaydb" % "flyway-sbt" % "4.2.0")
12+
addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.5.0")

0 commit comments

Comments
 (0)