electron and oak ver bump

nucleardreamer · May 5, 2018 · 3ac38d5 · 3ac38d5
1 parent 8a94075
commit 3ac38d5
Show file tree

Hide file tree

Showing 10 changed files with 234 additions and 182 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,26 +6,25 @@ ARG NPM_REGISTRY_URL=https://registry.npmjs.org/
 WORKDIR /opt/oak
 COPY . /opt/oak
 
-RUN apt-get update -qq \
-    && apt-get install -y -qq \
-        apt-utils \
-        build-essential \
-        dbus-x11 \
-        libasound2 \
-        libcanberra-gtk-module \
-        libcurl3 \
-        libexif-dev \
-        libgconf-2-4 \
-        libgl1-mesa-dri \
-        libgl1-mesa-glx \
-        libgtk2.0-0 \
-        libnotify4 \
-        libnss3 \
-        libudev-dev \
-        libxss1 \
-        libxtst6 \
-        python \
-        udev
+RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends \
+    apt-utils \
+    build-essential \
+    dbus-x11 \
+    libasound2 \
+    libcanberra-gtk-module \
+    libcurl3 \
+    libexif-dev \
+    libgconf-2-4 \
+    libgl1-mesa-dri \
+    libgl1-mesa-glx \
+    libgtk2.0-0 \
+    libnotify4 \
+    libnss3 \
+    libudev-dev \
+    libxss1 \
+    libxtst6 \
+    python \
+    udev
 
 RUN npm install --engine-strict=true --progress=false --loglevel="error" \
     && npm link \
@@ -37,7 +36,8 @@ WORKDIR /
 ENTRYPOINT ["oak"]
 CMD ["--help"]
 
-ENV ELECTRON_VERSION=1.8.4 \
+ENV NODE_ENV=production \
+    ELECTRON_VERSION=1.8.6 \
     DISPLAY=:0 \
     DEBUG=false \
     IGNORE_GPU_BLACKLIST=false \

diff --git a/Dockerfile.template b/Dockerfile.template
@@ -6,28 +6,28 @@ ARG NPM_REGISTRY_URL=https://registry.npmjs.org/
 WORKDIR /opt/oak
 COPY . /opt/oak
 
-RUN apt-get update -qq \
-    && apt-get install -y -qq --no-install-recommends \
-        apt-utils \
-        build-essential \
-        dbus-x11 \
-        libasound2 \
-        libcanberra-gtk-module \
-        libcurl3 \
-        libexif-dev \
-        libgconf-2-4 \
-        libgl1-mesa-dri \
-        libgl1-mesa-glx \
-        libgtk2.0-0 \
-        libnotify4 \
-        libnss3 \
-        libudev-dev \
-        libxss1 \
-        libxtst6 \
-        python \
-        udev
+RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends \
+    apt-utils \
+    build-essential \
+    dbus-x11 \
+    libasound2 \
+    libcanberra-gtk-module \
+    libcurl3 \
+    libexif-dev \
+    libgconf-2-4 \
+    libgl1-mesa-dri \
+    libgl1-mesa-glx \
+    libgtk2.0-0 \
+    libnotify4 \
+    libnss3 \
+    libudev-dev \
+    libxss1 \
+    libxtst6 \
+    python \
+    udev
 
 RUN npm install --engine-strict=true --progress=false --loglevel="error" \
+    && npm test \
     && npm link \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -37,7 +37,8 @@ WORKDIR /
 ENTRYPOINT ["oak"]
 CMD ["--help"]
 
-ENV ELECTRON_VERSION=%%ELECTRON_VERSION%% \
+ENV NODE_ENV=production \
+    ELECTRON_VERSION=%%ELECTRON_VERSION%% \
     DISPLAY=:0 \
     DEBUG=false \
     IGNORE_GPU_BLACKLIST=false \

diff --git a/docker-build.sh b/docker-build.sh
@@ -1,12 +1,12 @@
 #!/bin/bash -e
 
-OAK_VERSION="4.2.2";
+OAK_VERSION="4.2.3";
 BASE="oaklabs/oak:$OAK_VERSION";
 
 # our FROM line in the Dockerfile, should ideally match the current electron node version
 FROM="node";
 NODE_VERSION="8.11.1";
-ELECTRON_VERSION="1.8.4"
+ELECTRON_VERSION="1.8.6"
 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.2
+    image: oaklabs/oak:4.2.3
     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.2
+FROM oaklabs/oak:4.2.3
 
 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.2
+FROM oaklabs/oak:4.2.3
 
 WORKDIR /app
 COPY . /app

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