From 1f583e8ad3499a023caeee4b07032dc35ec83609 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Mon, 24 Nov 2014 13:07:36 +0530 Subject: [PATCH] browser-bundle is now renamed to browser-box --- Makefile | 8 ++++---- README.md | 8 ++++---- scripts/{browser-bundle => browser-box} | 4 ++-- start | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) rename scripts/{browser-bundle => browser-box} (85%) diff --git a/Makefile b/Makefile index bcdb157..c7a28cf 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ help: @echo "" @echo "-- Help Menu" @echo "" - @echo " 1. make build - build the browser-bundle image" + @echo " 1. make build - build the browser-box image" @echo " 1. make install - install launch wrappers" @echo " 2. make google-chrome - launch google-chrome" @echo " 2. make tor-browser - launch tor-browser" @@ -12,12 +12,12 @@ help: @echo "" build: - @docker build --tag=${USER}/browser-bundle . + @docker build --tag=${USER}/browser-box . install uninstall: build @docker run -it --rm \ --volume=/usr/local/bin:/target \ - ${USER}/browser-bundle:latest $@ + ${USER}/browser-box:latest $@ google-chrome tor-browser bash: @docker run -it --rm \ @@ -26,4 +26,4 @@ google-chrome tor-browser bash: --env="DISPLAY=${DISPLAY}" \ --volume=/tmp/.X11-unix:/tmp/.X11-unix \ --volume=/run/user/$(shell id -u)/pulse:/run/pulse \ - ${USER}/browser-bundle:latest $@ + ${USER}/browser-box:latest $@ diff --git a/README.md b/README.md index eab7c5f..85d2e91 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The image does require pulseaudio for audio support which is installed on all ma If you find this image useful here's how you can help: - Send a Pull Request with your awesome new features and bug fixes -- Help new users with [Issues](https://github.com/sameersbn/docker-browser-bundle/issues) they may encounter +- Help new users with [Issues](https://github.com/sameersbn/docker-browser-box/issues) they may encounter - Send me a tip via [Bitcoin](https://www.coinbase.com/sameersbn) or using [Gratipay](https://gratipay.com/sameersbn/) # Installation @@ -29,7 +29,7 @@ Install the wrapper scripts using: ```bash docker run -it --rm -v /usr/local/bin:/target \ -sameersbn/browser-bundle:latest install +sameersbn/browser-box:latest install ``` This will install wrapper scripts to launch @@ -57,14 +57,14 @@ The wrapper scripts volume mount the X11 and pulseaudio sockets in the launcher To upgrade to newer releases, simply update the image ``` -docker pull sameersbn/browser-bundle:latest +docker pull sameersbn/browser-box:latest ``` # Uninstallation ```bash docker run -it --rm -v /usr/local/bin:/target \ -sameersbn/browser-bundle:latest uninstall +sameersbn/browser-box:latest uninstall ``` # References diff --git a/scripts/browser-bundle b/scripts/browser-box similarity index 85% rename from scripts/browser-bundle rename to scripts/browser-box index cae584c..9cb1d0f 100755 --- a/scripts/browser-bundle +++ b/scripts/browser-box @@ -16,7 +16,7 @@ else for c in $(docker ps -a -q) do image="$(docker inspect -f {{.Config.Image}} ${c})" - if [ "${image}" == "sameersbn/browser-bundle:latest" ]; then + if [ "${image}" == "sameersbn/browser-box:latest" ]; then running=$(docker inspect -f {{.State.Running}} ${c}) if [ "${running}" != "true" ]; then docker rm "${c}" >/dev/null @@ -31,5 +31,5 @@ else --env="DISPLAY=${DISPLAY}" \ --volume=/tmp/.X11-unix:/tmp/.X11-unix \ --volume=/run/user/${USER_UID}/pulse:/run/pulse \ - sameersbn/browser-bundle:latest $(basename $0) $@ >/dev/null + sameersbn/browser-box:latest $(basename $0) $@ >/dev/null fi diff --git a/start b/start index 8dac098..004210f 100644 --- a/start +++ b/start @@ -3,18 +3,18 @@ set -e case "$1" in install) - echo "Installing browser-bundle..." - install -m 0755 /scripts/browser-bundle /target/ + echo "Installing browser-box..." + install -m 0755 /scripts/browser-box /target/ echo "Installing google-chrome..." - ln -sf browser-bundle /target/google-chrome + ln -sf browser-box /target/google-chrome echo "Installing google-chrome-stable..." - ln -sf browser-bundle /target/google-chrome-stable + ln -sf browser-box /target/google-chrome-stable echo "Installing tor-browser..." - ln -sf browser-bundle /target/tor-browser + ln -sf browser-box /target/tor-browser ;; uninstall) - echo "Uninstalling browser-bundle..." - rm -rf /target/browser-bundle + echo "Uninstalling browser-box..." + rm -rf /target/browser-box echo "Uninstalling google-chrome..." rm -rf /target/google-chrome echo "Uninstalling google-chrome-stable..."