Runtime Containerisation (#1345)

.github/workflows/release.yml

@@ -186,36 +186,16 @@ jobs:
           test $engineversion = $refversion || (echo "Tag version $refversion and the engine version $engineversion do not match" && false)
 
       # Verify License Packages in Distributions
-      - name: Verify Engine Licenses Package
+      - name: Verify Distributed Licenses Package
         working-directory: repo
+        if: runner.os != 'Windows' # TODO [RW] CRLF handling in licenses task
         shell: bash
         run: |
           sleep 1
           sbt "enso/verifyGeneratedPackage engine ${{ env.ENGINE_DIST_DIR }}/THIRD-PARTY"
-      - name: Verify Launcher Licenses Package
-        working-directory: repo
-        shell: bash
-        run: |
-          sleep 1
           sbt "enso/verifyGeneratedPackage launcher ${{ env.LAUNCHER_DIST_DIR }}/THIRD-PARTY"
-      - name: Verify Project Manager Licenses Package
-        working-directory: repo
-        shell: bash
-        run: |
-          sleep 1
           sbt "enso/verifyGeneratedPackage project-manager ${{ env.PROJECTMANAGER_DIST_DIR }}/THIRD-PARTY"
-
-      - name: Verify std-lib-Base Licenses Package
-        working-directory: repo
-        shell: bash
-        run: |
-          sleep 1
           sbt "enso/verifyGeneratedPackage std-lib-Base ${{ env.ENGINE_DIST_DIR }}/std-lib/Base/THIRD-PARTY"
-      - name: Verify std-lib-Table Licenses Package
-        working-directory: repo
-        shell: bash
-        run: |
-          sleep 1
           sbt "enso/verifyGeneratedPackage std-lib-Table ${{ env.ENGINE_DIST_DIR }}/std-lib/Table/THIRD-PARTY"
 
       # Publish
@@ -366,6 +346,20 @@ jobs:
           draft: true
           prerelease: true
 
+      - name: Login to ACR
+        uses: docker/login-action@v1.6
+        with:
+          registry: ensosharedwus2acr.azurecr.io
+          username: ${{ secrets.ACR_PUSH_CLIENT_ID }}
+          password: ${{ secrets.ACR_PUSH_CLIENT_SECRET }}
+
+      - name: Publish Runtime Docker Image
+        shell: bash
+        run: |
+          sleep 1
+          docker build -t ensosharedwus2acr.azurecr.io/runtime:${{ env.DIST_VERSION }} -f ./repo/tools/ci/docker/Dockerfile ./artifacts/enso-engine-${{ env.DIST_VERSION }}-linux-amd64/enso-${{ env.DIST_VERSION }}/component
+          docker push ensosharedwus2acr.azurecr.io/runtime:${{ env.DIST_VERSION }}
+
       # Publish the launcher packages to the backup/fallback S3 bucket
       - name: Prepare AWS Session
         shell: bash

engine/runner/src/main/scala/org/enso/runner/LanguageServerApp.scala

@@ -19,12 +19,24 @@ object LanguageServerApp {
     * @param config a config
     * @param logLevel log level
     */
-  def run(config: LanguageServerConfig, logLevel: LogLevel): Unit = {
-    println("Starting Language Server...")
+  def run(
+    config: LanguageServerConfig,
+    logLevel: LogLevel,
+    deamonize: Boolean
+  ): Unit = {
     val server = new LanguageServerComponent(config, logLevel)
-    Await.result(server.start(), 10.seconds)
+    Runtime.getRuntime.addShutdownHook(new Thread(() => {
+      Await.result(server.stop(), 20.seconds)
+    }))
+    Await.result(server.start(), 20.seconds)
+    if (deamonize) {
+      val lock = new AnyRef
+      lock.synchronized {
+        lock.wait()
+      }
+    } else {
       StdIn.readLine()
-    Await.result(server.stop(), 10.seconds)
+    }
   }
 
 }

engine/runner/src/main/scala/org/enso/runner/Main.scala

@@ -28,6 +28,7 @@ object Main {
   private val PROJECT_AUTHOR_EMAIL_OPTION = "new-project-author-email"
   private val REPL_OPTION                 = "repl"
   private val LANGUAGE_SERVER_OPTION      = "server"
+  private val DAEMONIZE_OPTION            = "daemon"
   private val INTERFACE_OPTION            = "interface"
   private val RPC_PORT_OPTION             = "rpc-port"
   private val DATA_PORT_OPTION            = "data-port"
@@ -100,6 +101,10 @@ object Main {
       .longOpt(LANGUAGE_SERVER_OPTION)
       .desc("Runs Language Server")
       .build()
+    val deamonizeOption = CliOption.builder
+      .longOpt(DAEMONIZE_OPTION)
+      .desc("Deamonize Language Server")
+      .build()
     val interfaceOption = CliOption.builder
       .longOpt(INTERFACE_OPTION)
       .hasArg(true)
@@ -181,6 +186,7 @@ object Main {
       .addOption(newProjectAuthorNameOpt)
       .addOption(newProjectAuthorEmailOpt)
       .addOption(lsOption)
+      .addOption(deamonizeOption)
       .addOption(interfaceOption)
       .addOption(rpcPortOption)
       .addOption(dataPortOption)
@@ -433,7 +439,11 @@ object Main {
         exitFail()
 
       case Right(config) =>
-        LanguageServerApp.run(config, logLevel)
+        LanguageServerApp.run(
+          config,
+          logLevel,
+          line.hasOption(DAEMONIZE_OPTION)
+        )
         exitSuccess()
     }
   }
@@ -554,7 +564,9 @@ object Main {
     if (line.hasOption(LANGUAGE_SERVER_OPTION)) {
       runLanguageServer(line, logLevel)
     }
+    if (line.getOptions.isEmpty) {
       printHelp(options)
       exitFail()
     }
   }
+}

lib/scala/json-rpc-server-test/src/main/scala/org/enso/jsonrpc/test/JsonRpcServerTestKit.scala

@@ -104,7 +104,7 @@ abstract class JsonRpcServerTestKit
 
     def send(json: Json): Unit = send(json.noSpaces)
 
-    def expectMessage(timeout: FiniteDuration = 3.seconds.dilated): String = {
+    def expectMessage(timeout: FiniteDuration = 5.seconds.dilated): String = {
       val message = outActor.expectMsgClass[String](timeout, classOf[String])
       if (debugMessages) println(message)
       message
@@ -112,7 +112,7 @@ abstract class JsonRpcServerTestKit
 
     def expectJson(
       json: Json,
-      timeout: FiniteDuration = 3.seconds.dilated
+      timeout: FiniteDuration = 5.seconds.dilated
     ): Assertion = {
       val parsed = parse(expectMessage(timeout))
       parsed shouldEqual Right(json)

lib/scala/project-manager/src/test/resources/application.conf

@@ -44,7 +44,7 @@ project-manager {
     request-timeout = 10 seconds
     boot-timeout = 30 seconds
     shutdown-timeout = 20 seconds
-    socket-close-timeout = 2 seconds
+    socket-close-timeout = 10 seconds
   }
 
   tutorials {

lib/scala/project-manager/src/test/scala/org/enso/projectmanager/ProjectManagementOps.scala

@@ -90,7 +90,7 @@ trait ProjectManagementOps { this: BaseServerSpec =>
             "result": null
           }
           """,
-      10.seconds.dilated
+      20.seconds.dilated
     )
   }
 

lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala

@@ -9,13 +9,14 @@ import nl.gn0s1s.bump.SemVer
 import org.apache.commons.io.FileUtils
 import org.enso.projectmanager.test.Net.tryConnect
 import org.enso.projectmanager.{BaseServerSpec, ProjectManagementOps}
-import org.enso.testkit.FlakySpec
+import org.enso.testkit.{FlakySpec, RetrySpec}
 
 import scala.io.Source
 
 class ProjectManagementApiSpec
     extends BaseServerSpec
     with FlakySpec
+    with RetrySpec
     with ProjectManagementOps {
 
   override def beforeEach(): Unit = {
@@ -577,7 +578,7 @@ class ProjectManagementApiSpec
       deleteProject(projectId)
     }
 
-    "move project dir on project close" taggedAs Flaky in {
+    "move project dir on project close".taggedAs(Retry, Flaky) in {
       implicit val client = new WsTestClient(address)
       //given
       val projectId = createProject("foo")

tools/ci/docker/Dockerfile

@@ -0,0 +1,30 @@
+FROM oracle/graalvm-ce:20.2.0-java11
+
+USER root
+
+RUN groupadd -g 1001 enso
+RUN useradd --system --create-home --uid 1001 --gid 1001 enso
+
+ADD runner.jar /opt/enso/runner.jar
+ADD runtime.jar /opt/enso/runtime.jar
+
+RUN chown -hR enso:enso /opt/enso
+RUN chmod -R u=rX,g=rX /opt/enso
+
+RUN mkdir -p /home/enso/workspace
+RUN chown -hR enso:enso /home/enso/workspace
+RUN chmod -R u=rwX,g=rwX /home/enso/workspace
+
+USER enso:enso
+
+WORKDIR /opt/enso
+
+ENTRYPOINT ["java", "-jar",  "-Dtruffle.class.path.append=runtime.jar", "-Dpolyglot.engine.IterativePartialEscape=true", "runner.jar" ]
+
+EXPOSE 30001
+EXPOSE 30002
+
+VOLUME /home/enso/workspace
+
+CMD ["--server", "--rpc-port", "30001", "--data-port", "30002", "--root-id", "00000000-0000-0000-0000-000000000001", "--path", "/home/enso/workspace", "--interface", "0.0.0.0"]
+