Replaced custom docker image with official graalvm image (TechEmpower#4223)

pmlopes · NateBrady23 · commit 25c8e7fd64cc · 2018-11-29T08:11:07.000-08:00
diff --git a/frameworks/JavaScript/es4x/es4x.dockerfile b/frameworks/JavaScript/es4x/es4x.dockerfile
@@ -1,24 +1,4 @@
-FROM ubuntu:18.04
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update && \
-    apt-get -y install curl && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV GRAALVM_VERSION=1.0.0-rc6
-
-# Get GraalVM CE
-RUN echo "Pulling graalvm ${GRAALVM_VERSION} binary from Github." \
-    && curl -sSLf https://github.com/oracle/graal/releases/download/vm-${GRAALVM_VERSION}/graalvm-ce-${GRAALVM_VERSION}-linux-amd64.tar.gz > /tmp/graalvm-ce-${GRAALVM_VERSION}-linux-amd64.tar.gz \
-    && mkdir -p /opt/java \
-    && tar -zxf /tmp/graalvm-ce-${GRAALVM_VERSION}-linux-amd64.tar.gz -C /opt/java \
-    && rm /tmp/graalvm-ce-${GRAALVM_VERSION}-linux-amd64.tar.gz
-
-ENV GRAALVM_HOME=/opt/java/graalvm-ce-${GRAALVM_VERSION}
-ENV JAVA_HOME=${GRAALVM_HOME}
-ENV PATH=${PATH}:${JAVA_HOME}/bin
-
+FROM oracle/graalvm-ce:1.0.0-rc9
 # Set working dir
 RUN mkdir /app
 WORKDIR /app
@@ -30,7 +10,7 @@ RUN npm --unsafe-perm install
 # Generate a runtime blog
 RUN npm run package
 
-CMD ${GRAALVM_HOME}/bin/java \
+CMD java \
     -server                                           \
     -XX:+UseNUMA                                      \
     -XX:+UseParallelGC                                \
@@ -43,6 +23,6 @@ CMD ${GRAALVM_HOME}/bin/java \
     -Dvertx.disableContextTimings=true                \
     -Dvertx.disableTCCL=true                          \
     -jar                                              \
-    target/es4x-0.0.1-fat.jar                         \
+    target/es4x-0.0.1-bin.jar                         \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`
diff --git a/frameworks/JavaScript/es4x/package.json b/frameworks/JavaScript/es4x/package.json
@@ -3,21 +3,24 @@
   "version": "0.0.1",
   "private": true,
   "main": "index.js",
-  "scripts": {
-    "postinstall": "vertx-scripts init",
-    "package": "vertx-scripts package"
-  },
   "devDependencies": {
-    "vertx-scripts": "latest",
-    "@vertx/unit": "latest"
+    "@vertx/unit": "3.5.4",
+    "es4x-cli": "0.0.3"
   },
   "dependencies": {
-    "@vertx/core": "3.5.3",
-    "@vertx/web": "3.5.3",
-    "@reactiverse/reactive-pg-client": "0.10.3"
+    "@vertx/core": "3.5.4",
+    "@vertx/web": "3.5.4",
+    "@reactiverse/reactive-pg-client": "0.10.5"
+  },
+  "scripts": {
+    "postinstall": "es4x postinstall",
+    "start": "es4x launcher run",
+    "test": "es4x launcher test",
+    "shell": "es4x shell",
+    "package": "es4x package"
   },
   "mvnDependencies": {
-    "io.vertx:vertx-web-templ-handlebars": "3.5.3"
+    "io.vertx:vertx-web-templ-handlebars": "3.5.4"
   },
   "files": [
     "util.js",
