[ARVADOS] updated: 9aecc4974eecdfaf94db275112c2a37601802fe7

[Git user]

Summary of changes:
 tools/arvbox/bin/arvbox                        | 4 ++--
 tools/arvbox/lib/arvbox/docker/Dockerfile.base | 2 +-
 tools/arvbox/lib/arvbox/docker/Dockerfile.demo | 1 +
 tools/arvbox/lib/arvbox/docker/Dockerfile.dev  | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

       via  9aecc4974eecdfaf94db275112c2a37601802fe7 (commit)
       via  f0bc71892f7ba3b2bb42e96598302676faa4a652 (commit)
      from  61060582be06315a7a44347acbab9613bf1c4c93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 9aecc4974eecdfaf94db275112c2a37601802fe7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Oct 17 09:53:37 2016 -0400

    10025: Add ARG arvados_version to .dev and .demo

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index 30756c9..0b92673 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -53,7 +53,7 @@ RUN set -e && \
  ln -s ../$PJS/bin/phantomjs /usr/local/bin/
 
 ARG arvados_version
-RUN echo arvados_version
+RUN echo arvados_version is git commit $arvados_version
 
 ADD fuse.conf /etc/
 
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
index a8431f9..d58719b 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -1,4 +1,5 @@
 FROM arvados/arvbox-base
+ARG arvados_version
 ARG sso_version=master
 
 RUN cd /usr/src && \
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.dev b/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
index 99db797..f99551e 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
@@ -1,4 +1,5 @@
 FROM arvados/arvbox-base
+ARG arvados_version
 
 ADD service/ /var/lib/arvbox/service
 RUN rmdir /etc/service && ln -sf /var/lib/arvbox/service /etc

commit f0bc71892f7ba3b2bb42e96598302676faa4a652
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Oct 17 09:48:38 2016 -0400

    10025: Use docker tag -f to change "latest".

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index 60917b5..e1949f1 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -266,10 +266,10 @@ build() {
     docker build --build-arg=arvados_version=$GITHEAD $NO_CACHE -t arvados/arvbox-base:$GITHEAD -f "$ARVBOX_DOCKER/Dockerfile.base" "$ARVBOX_DOCKER"
     if test "$1" = localdemo -o "$1" = publicdemo ; then
         docker build $NO_CACHE -t arvados/arvbox-demo:$GITHEAD -f "$ARVBOX_DOCKER/Dockerfile.demo" "$ARVBOX_DOCKER"
-        docker tag arvados/arvbox-demo:$GITHEAD arvados/arvbox-demo:latest
+        docker tag -f arvados/arvbox-demo:$GITHEAD arvados/arvbox-demo:latest
     else
         docker build $NO_CACHE -t arvados/arvbox-dev:$GITHEAD -f "$ARVBOX_DOCKER/Dockerfile.dev" "$ARVBOX_DOCKER"
-        docker tag arvados/arvbox-dev:$GITHEAD arvados/arvbox-dev:latest
+        docker tag -f arvados/arvbox-dev:$GITHEAD arvados/arvbox-dev:latest
     fi
 }
 

-----------------------------------------------------------------------


hooks/post-receive
--