projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In our rails postinstall package script, preserve newlines when looking
[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..73f1e2dc46c12db55efc3e2aa81a7eec8ed63d8f 100755
(executable)
--- a/
build/run-build-docker-images.sh
+++ b/
build/run-build-docker-images.sh
@@
-125,7
+125,7
@@
timer_reset
# clean up the docker build environment
cd "$WORKSPACE"
# clean up the docker build environment
cd "$WORKSPACE"
-tools/arvbox/bin/arvbox build
dev
+tools/arvbox/bin/arvbox build
localdemo
ECODE=$?
if [[ "$ECODE" != "0" ]]; then
ECODE=$?
if [[ "$ECODE" != "0" ]]; then
@@
-133,7
+133,7
@@
if [[ "$ECODE" != "0" ]]; then
EXITCODE=$(($EXITCODE + $ECODE))
fi
EXITCODE=$(($EXITCODE + $ECODE))
fi
-tools/arvbox/bin/arvbox build
localdemo
+tools/arvbox/bin/arvbox build
dev
ECODE=$?
ECODE=$?
@@
-148,11
+148,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