Test containerization

build.sbt

@@ -37,4 +37,5 @@ lazy val webapp = project
     // scala211 isn't compiling and complains on twirlCompileTemplates.
     crossScalaVersions := Seq(scala212)
   )
-
+
+addCommandAlias("dockerizeWebapp", ";webapp/docker:publishLocal")

main/build.sbt

@@ -60,7 +60,7 @@ libraryDependencies ++= {
     // Instead, all code makes use of the Java interface.
     "org.slf4j"                   % "slf4j-api"                % "1.7.32", // MIT
     // Local logging is provided here but not published.
-    "ch.qos.logback" % "logback-classic" % "1.2.8", // up to 1.2.8; less than 1.2 is vulnerable
+    "ch.qos.logback"              % "logback-classic"          % "1.2.8", // up to 1.2.8; less than 1.2 is vulnerable
     // testing
     "org.scalatest"              %% "scalatest"                % "3.2.10"  % Test, // Apache-2.0
     // trained models for local ML models used in both main and corenlp

webapp/README.md

@@ -11,15 +11,7 @@ One can start the webapp directly from within `sbt` in development mode with the
 
 ## Dockerization
 
-The subdirectory `Docker` contains `Dockerfiles` to generate images in
-multiple varieties along with documentation in the [Docker/README.md](./Docker/README.md) file.
-
-In recent versions of processors there is also a `docker.sbt` file which allows one
-to build an image from within `sbt`.  This method tends to be much faster than
-the alternatives.  A command alias `dockerizeWebapp` has been set up to first cache
-geonames (in ./cache/geonames) and then construct the image including the names.
-If the cache has already been constructed, one can use the command
-`webapp/docker:publishLocal` to just build the image.
+There is also a `docker.sbt` file which allows one to build an image from within `sbt`.  A command alias `dockerizeWebapp` has been set up for it.
 
 To run the resulting image, use a command like
 ```bash

webapp/build.sbt

@@ -6,7 +6,7 @@ libraryDependencies ++= Seq(
   guice,
   // Newer than 4.0.3 does not work for Scala 2.11.  There is no Scala 3 version.
   "org.scalatestplus.play" %% "scalatestplus-play" % "4.0.3" % Test // up to 5.1.0
-) // .map(_.cross(CrossVersion.for3Use2_13))
+)
 
 Compile / packageBin / mappings := {
   val filtered = (Compile / packageBin / mappings).value.filter {

webapp/docker.sbt

@@ -1,5 +1,4 @@
 import NativePackagerHelper._
-import com.typesafe.sbt.packager.MappingsHelper.directory
 import com.typesafe.sbt.packager.docker.{Cmd, CmdLike, DockerChmodType, DockerPermissionStrategy}
 
 val topDir = "/processors/webapp"
@@ -47,19 +46,4 @@ dockerCommands := dockerCommands.value.flatMap { dockerCommand: CmdLike =>
   }
 }
 
-def moveDir(dirname: String): Seq[(File, String)] = {
-  val dir = file(dirname)
-  val result = dir
-    .**(AllPassFilter)
-    .pair(relativeTo(dir.getParentFile))
-    .map { case (file, _) => (file, file.getPath) }
-
-//  result.foreach { case (file, string) =>
-//    println(s"$file -> $string")
-//  }
-  result
-}
-
-Universal / mappings ++= moveDir("./cache/geonames")
-
 Global / excludeLintKeys += Docker / dockerBaseImage