projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14287: Ignore etag and unsigned_manifest_text in collection updates.
[arvados.git]
/
build
/
run-build-docker-images.sh
diff --git
a/build/run-build-docker-images.sh
b/build/run-build-docker-images.sh
index 0a5841dae23b6e7479437fe5413324199726597e..fd7b38e8b64e66e3c18275578890a84c3ccdd2a4 100755
(executable)
--- a/
build/run-build-docker-images.sh
+++ b/
build/run-build-docker-images.sh
@@
-1,4
+1,7
@@
#!/bin/bash
#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
function usage {
echo >&2
function usage {
echo >&2
@@
-125,7
+128,9
@@
timer_reset
# clean up the docker build environment
cd "$WORKSPACE"
# clean up the docker build environment
cd "$WORKSPACE"
-tools/arvbox/bin/arvbox build dev
+title "Starting arvbox build localdemo"
+
+tools/arvbox/bin/arvbox build localdemo
ECODE=$?
if [[ "$ECODE" != "0" ]]; then
ECODE=$?
if [[ "$ECODE" != "0" ]]; then
@@
-133,7
+138,9
@@
if [[ "$ECODE" != "0" ]]; then
EXITCODE=$(($EXITCODE + $ECODE))
fi
EXITCODE=$(($EXITCODE + $ECODE))
fi
-tools/arvbox/bin/arvbox build localdemo
+title "Starting arvbox build dev"
+
+tools/arvbox/bin/arvbox build dev
ECODE=$?
ECODE=$?
@@
-148,11
+155,11
@@
title "uploading images"
timer_reset
timer_reset
-if [[ "$ECODE" != "0" ]]; then
+if [[ "$E
XIT
CODE" != "0" ]]; then
title "upload arvados images SKIPPED because build failed"
else
title "upload arvados images SKIPPED because build failed"
else
- if [[ $upload == true ]]; then
- ## 20150526 nico -- *sometimes* dockerhub needs re-login
+ if [[ $upload == true ]]; then
+ ## 20150526 nico -- *sometimes* dockerhub needs re-login
## even though credentials are already in .dockercfg
docker login -u arvados
## even though credentials are already in .dockercfg
docker login -u arvados