From 1a1bb326a8a5a7e12204f60d120800cf9a72237f Mon Sep 17 00:00:00 2001 From: Flynn Joffray Date: Sat, 13 May 2017 11:00:36 -0400 Subject: [PATCH] version bump --- build.sh | 2 +- manifest.yml | 8 ++++---- package.json | 2 +- readme.md | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.sh b/build.sh index 528c835..b41b1f0 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -OAK_VERSION="2.0.0" +OAK_VERSION="2.1.0" BASE="oaklabs/oak:$OAK_VERSION" # our FROM line in the Dockerfile, should ideally match the current electron node version diff --git a/manifest.yml b/manifest.yml index 54057c7..1a6fa1a 100644 --- a/manifest.yml +++ b/manifest.yml @@ -1,14 +1,14 @@ -image: oaklabs/oak:2.0.0 +image: oaklabs/oak:2.1.0 manifests: - - image: oaklabs/oak:2.0.0-arm + - image: oaklabs/oak:2.1.0-arm platform: architecture: arm os: linux - - image: oaklabs/oak:2.0.0-arm64 + - image: oaklabs/oak:2.1.0-arm64 platform: architecture: arm64 os: linux - - image: oaklabs/oak:2.0.0-amd64 + - image: oaklabs/oak:2.1.0-amd64 platform: architecture: amd64 os: linux diff --git a/package.json b/package.json index ef86984..aa9a3f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oak", - "version": "2.0.0", + "version": "2.1.0", "description": "A very opinionated kiosk framework based on Electron", "engines": { "node": "7.4.0" diff --git a/readme.md b/readme.md index 2e8690a..9a698a2 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,5 @@ # Oak -[![release](https://img.shields.io/badge/release-v2.0.0-green.svg)](https://github.com/OakLabsInc/oak/releases/tag/2.0.0) +[![release](https://img.shields.io/badge/release-v2.1.0-green.svg)](https://github.com/OakLabsInc/oak/releases/tag/2.1.0) [![node](https://img.shields.io/badge/node-v7.4.0-green.svg)](https://github.com/nodejs/node/releases/tag/v7.4.0) [![electron](https://img.shields.io/badge/electron-v1.6.6-green.svg)](https://github.com/electron/electron/releases/tag/v1.6.6) [![Coverage Status](https://coveralls.io/repos/github/OakLabsInc/oak/badge.svg?branch=master&t=zYcBU6)](https://coveralls.io/github/OakLabsInc/oak?branch=master) @@ -33,6 +33,7 @@ $ oak --help -h, --height Window height -i, --insecure Allow insecure connections (not recommended) -k, --kiosk Kiosk mode + -n, --node Enable node integration -t, --ontop Start window ontop of others -s, --show Show window on start -S, --shortcut [list] Register shortcuts, comma separated. reload,quit