[ARVADOS] updated: 2.3.0-4-gd588e6bca
Git user
git at public.arvados.org
Fri Oct 29 21:00:13 UTC 2021
Summary of changes:
build/run-build-docker-images.sh | 5 ++++-
doc/install/arvbox.html.textile.liquid | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
via d588e6bca2e886dc978d3cd8ca17002d41fbe585 (commit)
via 6c8a0923515a0c9e085fa852de3a48f849a742fe (commit)
from fb39000148809df935ada41cd3be373fde268c57 (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 d588e6bca2e886dc978d3cd8ca17002d41fbe585
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Fri Oct 29 16:59:55 2021 -0400
Fix arvbox versioning. no issue #
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/doc/install/arvbox.html.textile.liquid b/doc/install/arvbox.html.textile.liquid
index a8235ee70..8e787d5a2 100644
--- a/doc/install/arvbox.html.textile.liquid
+++ b/doc/install/arvbox.html.textile.liquid
@@ -14,9 +14,9 @@ Arvbox is a Docker-based self-contained development, demonstration and testing e
h2. Quick start
<pre>
-$ curl -O https://git.arvados.org/arvados.git/blob_plain/refs/heads/main:/tools/arvbox/bin/arvbox
+$ curl -O https://git.arvados.org/arvados.git/blob_plain/refs/heads/2.3-dev:/tools/arvbox/bin/arvbox
$ chmod +x arvbox
-$ ./arvbox start localdemo latest
+$ ./arvbox start localdemo 2.3.0
$ ./arvbox adduser demouser demo at example.com
</pre>
commit 6c8a0923515a0c9e085fa852de3a48f849a742fe
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Sep 9 10:16:49 2021 -0400
Tweak docker image tagging
no issue #
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/build/run-build-docker-images.sh b/build/run-build-docker-images.sh
index 8cff14b71..00ef2de41 100755
--- a/build/run-build-docker-images.sh
+++ b/build/run-build-docker-images.sh
@@ -85,11 +85,14 @@ docker_push () {
# docker always creates a local 'latest' tag, and we don't want to push that
# tag in every case. Remove it.
docker rmi $1:latest
+
+ GITHEAD=$(cd $WORKSPACE && git log --format=%H -n1 HEAD)
+
if [[ ! -z "$tags" ]]
then
for tag in $( echo $tags|tr "," " " )
do
- $DOCKER tag $1 $1:$tag
+ $DOCKER tag $1:$GITHEAD $1:$tag
done
fi
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list