Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
nucleardreamer committed May 13, 2017
1 parent 084d60f commit 1a1bb32
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -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
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: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
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": "2.0.0",
"version": "2.1.0",
"description": "A very opinionated kiosk framework based on Electron",
"engines": {
"node": "7.4.0"
Expand Down
3 changes: 2 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -33,6 +33,7 @@ $ oak --help
-h, --height <Number> 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
Expand Down

0 comments on commit 1a1bb32

Please sign in to comment.