Skip to content

Commit

Permalink
electron and oak version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
nucleardreamer committed Jan 28, 2018
1 parent b1ecd3a commit b7a958d
Show file tree
Hide file tree
Showing 9 changed files with 378 additions and 506 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ WORKDIR /
ENTRYPOINT ["oak"]
CMD ["/opt/oak/examples/simple-script/index.js"]

ENV ELECTRON_VERSION=1.7.9 \
ENV ELECTRON_VERSION=1.7.11 \
DISPLAY=:0 \
DEBUG=false \
IGNORE_GPU_BLACKLIST=false \
Expand Down
4 changes: 2 additions & 2 deletions docker-build.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash -e

OAK_VERSION="4.1.2";
OAK_VERSION="4.1.3";
BASE="oaklabs/oak:$OAK_VERSION";

# our FROM line in the Dockerfile, should ideally match the current electron node version
FROM="node";
NODE_VERSION="7.9.0";
ELECTRON_VERSION="1.7.9"
ELECTRON_VERSION="1.7.11"
FROM_TAG="$NODE_VERSION-slim";

NPM_URL="https://registry.npmjs.org/";
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
oak:
build: .
container_name: oak
image: oaklabs/oak:4.1.2
image: oaklabs/oak:4.1.3
network_mode: host
devices:
# our video card device, may vary per operating system
Expand Down
2 changes: 1 addition & 1 deletion examples/multiple-windows/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM oaklabs/oak:4.1.2
FROM oaklabs/oak:4.1.3

WORKDIR /app
COPY . /app
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-url/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM oaklabs/oak:4.1.2
FROM oaklabs/oak:4.1.3

WORKDIR /app
COPY . /app
Expand Down
8 changes: 4 additions & 4 deletions manifest.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
image: oaklabs/oak:4.1.2
image: oaklabs/oak:4.1.3
manifests:
# - image: oaklabs/oak:4.1.2-arm
# - image: oaklabs/oak:4.1.3-arm
# platform:
# architecture: arm
# os: linux
# - image: oaklabs/oak:4.1.2-arm64
# - image: oaklabs/oak:4.1.3-arm64
# platform:
# architecture: arm64
# os: linux
- image: oaklabs/oak:4.1.2-amd64
- image: oaklabs/oak:4.1.3-amd64
platform:
architecture: amd64
os: linux
Loading

0 comments on commit b7a958d

Please sign in to comment.