electron 1.8.4, stretch base layer

nucleardreamer · Apr 23, 2018 · 62f1f25 · 62f1f25
1 parent 97cd4cd
commit 62f1f25
Show file tree

Hide file tree

Showing 10 changed files with 247 additions and 227 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ notifications:
   email: false
 language: node_js
 node_js:
-  - "8.2.1"
+  - "8.11.1"
 matrix:
   include:
     - os: linux

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8.2.1-slim
+FROM node:8.11.1-stretch
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG NPM_REGISTRY_URL=https://registry.npmjs.org/
@@ -7,7 +7,7 @@ WORKDIR /opt/oak
 COPY . /opt/oak
 
 RUN apt-get update -qq \
-    && apt-get install -y -qq --no-install-recommends \
+    && apt-get install -y -qq \
         apt-utils \
         build-essential \
         dbus-x11 \
@@ -37,7 +37,7 @@ WORKDIR /
 ENTRYPOINT ["oak"]
 CMD ["--help"]
 
-ENV ELECTRON_VERSION=1.8.3 \
+ENV ELECTRON_VERSION=1.8.4 \
     DISPLAY=:0 \
     DEBUG=false \
     IGNORE_GPU_BLACKLIST=false \

diff --git a/docker-build.sh b/docker-build.sh
@@ -1,13 +1,13 @@
 #!/bin/bash -e
 
-OAK_VERSION="4.2.1";
+OAK_VERSION="4.2.2";
 BASE="oaklabs/oak:$OAK_VERSION";
 
 # our FROM line in the Dockerfile, should ideally match the current electron node version
 FROM="node";
-NODE_VERSION="8.2.1";
-ELECTRON_VERSION="1.8.3"
-FROM_TAG="$NODE_VERSION-slim";
+NODE_VERSION="8.11.1";
+ELECTRON_VERSION="1.8.4"
+FROM_TAG="$NODE_VERSION-stretch";
 
 NPM_URL="https://registry.npmjs.org/";
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
   oak:
     build: .
     container_name: oak
-    image: oaklabs/oak:4.2.1
+    image: oaklabs/oak:4.2.2
     network_mode: host
     devices:
       # our video card device, may vary per operating system

diff --git a/examples/multiple-windows/Dockerfile b/examples/multiple-windows/Dockerfile
@@ -1,4 +1,4 @@
-FROM oaklabs/oak:4.2.1
+FROM oaklabs/oak:4.2.2
 
 WORKDIR /app
 COPY . /app

diff --git a/examples/simple-url/Dockerfile b/examples/simple-url/Dockerfile
@@ -1,4 +1,4 @@
-FROM oaklabs/oak:4.2.1
+FROM oaklabs/oak:4.2.2
 
 WORKDIR /app
 COPY . /app

diff --git a/manifest.yml b/manifest.yml
@@ -1,14 +1,14 @@
-image: oaklabs/oak:4.2.1
+image: oaklabs/oak:4.2.2
 manifests:
-  # - image: oaklabs/oak:4.2.1-arm
+  # - image: oaklabs/oak:4.2.2-arm
   #   platform:
   #     architecture: arm
   #     os: linux
-  # - image: oaklabs/oak:4.2.1-arm64
+  # - image: oaklabs/oak:4.2.2-arm64
   #   platform:
   #     architecture: arm64
   #     os: linux
-  - image: oaklabs/oak:4.2.1-amd64
+  - image: oaklabs/oak:4.2.2-amd64
     platform:
       architecture: amd64
       os: linux