Skip to content

Commit

Permalink
adding --no-sandbox for Dockerfile, checking the HOME env variable
Browse files Browse the repository at this point in the history
  • Loading branch information
rjoffray committed Jun 29, 2020
1 parent a15022d commit 5bf59bc
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Oak

[![release](https://img.shields.io/badge/release-v6.0.0-green.svg)](https://github.com/OakLabsInc/oak/releases/tag/6.0.0)
[![release](https://img.shields.io/badge/release-v6.0.1-green.svg)](https://github.com/OakLabsInc/oak/releases/tag/6.0.1)
[![node](https://img.shields.io/badge/node-v12.18.1-green.svg)](https://github.com/nodejs/node/releases/tag/v12.18.1)
[![electron](https://img.shields.io/badge/electron-v6.1.12-green.svg)](https://github.com/electron/electron/releases/tag/v6.1.12)
[![Coverage Status](https://coveralls.io/repos/github/OakLabsInc/oak/badge.svg?t=zYcBU6)](https://coveralls.io/github/OakLabsInc/oak)
Expand Down
14 changes: 10 additions & 4 deletions bin/entrypoint
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,18 @@ const { spawn } = require('child_process')
const electron = require('electron')
const _ = require('lodash')

let args = [
join(__dirname, '..'),
...(process.argv.splice(2, process.argv.length))
]

if (process.env.HOME && process.env.HOME === '/root') {
args.push('--no-sandbox')
}

spawn(
electron,
[
join(__dirname, '..'),
...(process.argv.splice(2, process.argv.length))
],
args,
{
stdio: 'inherit',
env: _.defaults(process.env, {
Expand Down
2 changes: 1 addition & 1 deletion docker-deploy.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -e

OAK_VERSION="6.0.0"
OAK_VERSION="6.0.1"
BASE="oaklabs/oak"

# our FROM line in the Dockerfile, should ideally match the current electron node version
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:6.0.0
FROM oaklabs/oak:6.0.1

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:6.0.0
FROM oaklabs/oak:6.0.1

WORKDIR /app
COPY . /app
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oak",
"version": "6.0.0",
"version": "6.0.1",
"description": "A very opinionated kiosk framework based on Electron",
"engines": {
"node": ">=12.18.x"
Expand Down

0 comments on commit 5bf59bc

Please sign in to comment.