Merge branch 'master' into version-bug-fixed

Dockerfile

@@ -1,4 +1,4 @@
-FROM sameersbn/ubuntu:14.04.20161217
+FROM sameersbn/ubuntu:14.04.20170110
 
 ENV TOR_VERSION=6.0.8 \
     TOR_FINGERPRINT=0x4E2C6E8793298290

README.md

@@ -1,6 +1,6 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/browser-box/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/browser-box)
 
-# sameersbn/browser-box:1.0.1
+# sameersbn/browser-box:1.0.1-1
 
 - [Introduction](#introduction)
   - [Contributing](#contributing)
@@ -57,7 +57,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/browser-box)
 
 ```bash
-docker pull sameersbn/browser-box:1.0.1
+docker pull sameersbn/browser-box:1.0.1-1
 ```
 
 Alternatively you can build the image yourself.
@@ -72,7 +72,7 @@ With the image locally available, install the wrapper scripts using:
 docker run -it --rm \
   --volume /usr/local/bin:/target \
   --env BROWSER_BOX_REPO=sameersbn \
-  sameersbn/browser-box:1.0.1 install
+  sameersbn/browser-box:1.0.1-1 install
 ```
 
 If you would the settings for chrome and firefox to persist
@@ -84,7 +84,7 @@ docker run -it --rm \
   --env CHROME_USERDATA=/home/username/.chrome \
   --env FIREFOX_USERDATA=/home/username/.mozillia \
   --env BROWSER_BOX_REPO=sameersbn \
-  sameersbn/browser-box:1.0.1 install
+  sameersbn/browser-box:1.0.1-1 install
 ```
 
 
@@ -119,7 +119,7 @@ To upgrade to newer releases:
   1. Download the updated Docker image:
 
   ```bash
-  docker pull sameersbn/browser-box:1.0.1
+  docker pull sameersbn/browser-box:1.0.1-1
   ```
 
   2. Run `install` to make sure the host scripts are updated.
@@ -127,7 +127,7 @@ To upgrade to newer releases:
   ```bash
   docker run -it --rm \
     --volume /usr/local/bin:/target \
-    sameersbn/browser-box:1.0.1 install
+    sameersbn/browser-box:1.0.1-1 install
   ```
 
 ## Uninstallation
@@ -135,7 +135,7 @@ To upgrade to newer releases:
 ```bash
 docker run -it --rm \
   --volume /usr/local/bin:/target \
-  sameersbn/browser-box:1.0.1 uninstall
+  sameersbn/browser-box:1.0.1-1 uninstall
 ```
 
 ## Shell Access

VERSION

@@ -1 +1 @@
-1.0.1
+1.0.1-1

scripts/browser-box

@@ -4,7 +4,7 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
 # TODO: ensure this gets updated by entrypoint script on install
 BROWSER_BOX_USER=${BROWSER_BOX_USER:-browser}
 BROWSER_BOX_REPO=${BROWSER_BOX_REPO:-sameersbn}
-BROWSER_BOX_VERSION=${BROWSER_BOX_VERSION:-1.0.1}
+BROWSER_BOX_VERSION=${BROWSER_BOX_VERSION:-1.0.1-1}
 BROWSERS=(chromium-browser firefox google-chrome google-chrome-stable tor-browser)
 # Persistant data directories CHROME_USERDATA="" FIREFOX_USERDATA=""
 # do we need to use sudo to start docker containers?
@@ -151,4 +151,5 @@ ${SUDO} docker run -d \
   ${VIDEO_DEVICES} \
   ${VOLUMES} \
   --name="${prog}" \
-  ${BROWSER_BOX_REPO}/browser-box:${BROWSER_BOX_VERSION} ${prog} $@ >/dev/null
+
+  ${BROWSER_BOX_REPO}/browser-box:${BROWSER_BOX_VERSION} ${prog} $@ >/dev/null