Skip to content

Commit

Permalink
upgrading electron minor, adding in regular pino logging
Browse files Browse the repository at this point in the history
  • Loading branch information
nucleardreamer committed Jan 30, 2019
1 parent 03277c0 commit 1c91484
Show file tree
Hide file tree
Showing 7 changed files with 2,172 additions and 34 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ RUN npm install --engine-strict=true \

ENTRYPOINT ["oak"]

ENV npm_config_target=3.0.11 \
ENV npm_config_target=3.1.2 \
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=3.0.11 \
ELECTRON_VERSION=3.1.2 \
DISPLAY=:0 \
IGNORE_GPU_BLACKLIST=false \
NODE_TLS_REJECT_UNAUTHORIZED=0 \
Expand Down
4 changes: 2 additions & 2 deletions docker-deploy.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash -e

OAK_VERSION="5.0.1"
OAK_VERSION="5.0.2"
BASE="oaklabs/oak"

# our FROM line in the Dockerfile, should ideally match the current electron node version
ELECTRON_VERSION="3.0.11"
ELECTRON_VERSION="3.1.2"
FROM="node:10.14.2-stretch"

NPM_URL="https://registry.npmjs.org/"
Expand Down
Loading

0 comments on commit 1c91484

Please sign in to comment.