adding oak-rebuild bin, electron upgrade

.nvmrc

@@ -0,0 +1 @@
+v8.11.3

Dockerfile

@@ -37,7 +37,12 @@ WORKDIR /
 ENTRYPOINT ["oak"]
 CMD ["--help"]
 
-ENV NODE_ENV=production \
+ENV npm_config_target=1.8.7 \
+    npm_config_runtime=electron \
+    npm_config_arch=x64 \
+    npm_config_target_arch=x64 \
+    npm_config_disturl=https://atom.io/download/electron \
+    NODE_ENV=production \
     ELECTRON_VERSION=1.8.7 \
     DISPLAY=:0 \
     DEBUG=false \

Dockerfile.template

@@ -37,7 +37,12 @@ WORKDIR /
 ENTRYPOINT ["oak"]
 CMD ["--help"]
 
-ENV NODE_ENV=production \
+ENV npm_config_target=%%ELECTRON_VERSION%% \
+    npm_config_runtime=electron \
+    npm_config_arch=x64 \
+    npm_config_target_arch=x64 \
+    npm_config_disturl=https://atom.io/download/electron \
+    NODE_ENV=production \
     ELECTRON_VERSION=%%ELECTRON_VERSION%% \
     DISPLAY=:0 \
     DEBUG=false \

bin/rebuild

@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+echo ""
+echo "Rebuilding node modules at $1"
+echo ""
+
+ELECTRON_VERSION=${ELECTRON_VERSION:=$(oak version electron)}
+
+pushd $1
+export npm_config_target=$ELECTRON_VERSION
+export npm_config_runtime=electron
+export npm_config_arch=x64
+export npm_config_target_arch=x64
+export npm_config_disturl=https://atom.io/download/electron
+
+npm rebuild
+popd
+
+echo ""
+echo "Finished rebuilding native modules"

docker-build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-OAK_VERSION="4.2.4";
+OAK_VERSION="4.3.0";
 BASE="oaklabs/oak:$OAK_VERSION";
 
 # our FROM line in the Dockerfile, should ideally match the current electron node version

docker-compose.yml

@@ -7,7 +7,7 @@ services:
   oak:
     build: .
     container_name: oak
-    image: oaklabs/oak:4.2.4
+    image: oaklabs/oak:4.3.0
     network_mode: host
     devices:
       # our video card device, may vary per operating system

examples/multiple-windows/Dockerfile

@@ -1,4 +1,4 @@
-FROM oaklabs/oak:4.2.4
+FROM oaklabs/oak:4.3.0
 
 WORKDIR /app
 COPY . /app

examples/simple-url/Dockerfile

@@ -1,4 +1,4 @@
-FROM oaklabs/oak:4.2.4
+FROM oaklabs/oak:4.3.0
 
 WORKDIR /app
 COPY . /app

manifest.yml

@@ -1,14 +1,14 @@
-image: oaklabs/oak:4.2.4
+image: oaklabs/oak:4.3.0
 manifests:
-  # - image: oaklabs/oak:4.2.4-arm
+  # - image: oaklabs/oak:4.3.0-arm
   #   platform:
   #     architecture: arm
   #     os: linux
-  # - image: oaklabs/oak:4.2.4-arm64
+  # - image: oaklabs/oak:4.3.0-arm64
   #   platform:
   #     architecture: arm64
   #     os: linux
-  - image: oaklabs/oak:4.2.4-amd64
+  - image: oaklabs/oak:4.3.0-amd64
     platform:
       architecture: amd64
       os: linux