Fixing install from docker hub. Use default repo.

Makefile

@@ -18,7 +18,8 @@ VOLUMES = \
 	--volume=/run/user/$(shell id -u)/pulse:/run/pulse
 
 ENV_INSTL_USER = \
-	--env="BROWSER_BOX_USER=${USER}"
+	--env="BROWSER_BOX_USER=${USER}" \
+	--env="BROWSER_BOX_REPO=${USER}"
 
 ifdef CHROME_USERDATA
 ENV_CHROME_USERDATA = \

entrypoint.sh

@@ -3,7 +3,9 @@ set -e
 
 USER_UID=${USER_UID:-1000}
 USER_GID=${USER_GID:-1000}
+
 BROWSER_BOX_USER=${BROWSER_BOX_USER:-browser}
+BROWSER_BOX_REPO=${BROWSER_BOX_REPO:-sameersbn}
 
 install_browser_box() {
   echo "Installing browser-box..."
@@ -32,6 +34,7 @@ install_browser_box() {
     echo "Updating FireFox user volume..."
     sed -i -e s%"FIREFOX_USERDATA=.*$"%"FIREFOX_USERDATA\=${FIREFOX_USERDATA}"%1 /target/browser-box
   fi
+  sed -i -e s%"\(BROWSER_BOX_REPO=\).*$"%"\1${BROWSER_BOX_REPO}"%g
 
 }
 

scripts/browser-box

@@ -3,8 +3,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:-$USER}
-USER_REPO=${BROWSER_BOX_REPO:-"sameersbn"}
+BROWSER_BOX_REPO=${BROWSER_BOX_REPO:-sameersbn}
 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?
@@ -32,7 +31,7 @@ cleanup_stopped_browser_box_instances() {
   for c in $(${SUDO} docker ps -a -q)
   do
     image=$(${SUDO} docker inspect -f {{.Config.Image}} ${c})
-    if [[ ${image} == "${USER_REPO}/browser-box:latest" ]]; then
+    if [[ ${image} == "${BROWSER_BOX_REPO}/browser-box:latest" ]]; then
       running=$(${SUDO} docker inspect -f {{.State.Running}} ${c})
       if [[ ${running} != true ]]; then
         ${SUDO} docker rm -v "${c}" >/dev/null
@@ -58,7 +57,7 @@ prepare_docker_env_parameters() {
   ENV_VARS+=" --env=XAUTHORITY=${XAUTH}"
   ENV_VARS+=" --env=BROWSER_BOX_USER=${BROWSER_BOX_USER}"
   if [ -f /etc/timezone ]; then
-	  ENV_VARS+=" --env=TZ=$(cat /etc/timezone)"
+	ENV_VARS+=" --env=TZ=$(cat /etc/timezone)"
   else
     [ ! -z "${TIMEZONE}" ] && ENV_VARS+=" --env=TZ=${TIMEZONE}"
   fi
@@ -151,4 +150,4 @@ ${SUDO} docker run -d \
   ${VIDEO_DEVICES} \
   ${VOLUMES} \
   --name="${prog}" \
-  ${USER_REPO}/browser-box:latest ${prog} $@ >/dev/null
+  ${BROWSER_BOX_REPO}/browser-box:latest ${prog} $@ >/dev/null