diff options
| -rw-r--r-- | mavigator-server/build.sbt | 39 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
2 files changed, 0 insertions, 41 deletions
diff --git a/mavigator-server/build.sbt b/mavigator-server/build.sbt index d8826c0..378ff8f 100644 --- a/mavigator-server/build.sbt +++ b/mavigator-server/build.sbt @@ -17,47 +17,8 @@ fork in run := true connectInput in run := true cancelable in Global := true -import sbtassembly.AssemblyPlugin.defaultShellScript -//assemblyOption in assembly := (assemblyOption in assembly).value.copy(prependShellScript = Some(defaultShellScript)) assemblyJarName in assembly := "mavigator.jar" - assemblyMergeStrategy in assembly := { case "JS_DEPENDENCIES" => MergeStrategy.discard case other => (assemblyMergeStrategy in assembly).value(other) } - - -/* - * Deployment configuration - */ -enablePlugins(DockerPlugin) - -lazy val filter = ScopeFilter( - inAnyProject, - inConfigurations(Compile) -) - -dockerfile in docker := { - val mainclass = (mainClass in Compile in packageBin).value.getOrElse(sys.error("Expected exactly one main class")) - - val jarFiles: List[File] = packageBin.all(filter).value.toList ::: - (fullClasspath in Compile).value.files.toList - - val cp = jarFiles.map{ file => - s"/opt/mavigator/lib/${file.getName}" - }.mkString(":") - - new Dockerfile { - from("java:8") - add(jarFiles, "/opt/mavigator/lib/") - expose(8080) - entryPoint("java", "-cp", cp, mainclass) - } -} - -buildOptions in docker := BuildOptions( - pullBaseImage = BuildOptions.Pull.Always, - removeIntermediateContainers = BuildOptions.Remove.Always -) - -imageName in docker := ImageName(s"jodersky/mavigator:${version.value}") diff --git a/project/plugins.sbt b/project/plugins.sbt index 581c6bf..cfb1149 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -31,6 +31,4 @@ addSbtPlugin("com.github.jodersky" % "sbt-mavlink" % "0.8.0") // generate documentation for all projects //addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3") -addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.0") - addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3") |