@@ -139,12 +139,14 @@ if [ ! -f Dockerfile ]; then
139139 cp $DOCKERFILE_SHIM ./Dockerfile
140140fi
141141
142+ echo
142143puts-step " Building Docker image"
143144docker build -t $TMP_IMAGE . 2>&1
144145docker tag $TMP_IMAGE $TARGET_IMAGE
145146
146147puts-step " Pushing image to private registry"
147148docker push $TARGET_IMAGE & > /dev/null
149+ echo
148150
149151if [ -f $TMP_DIR /slug.tgz ]; then
150152 RELEASE_INFO=$( tar --to-stdout -xf $TMP_DIR /slug.tgz ./.release | python -c ' import sys,yaml,json;print json.dumps(yaml.safe_load(sys.stdin).get("default_process_types", {}))' )
165167RELEASE_INFO=$( echo $RELEASE_INFO | sed -e ' s/\"/\\\"/g' )
166168DOCKERFILE=$( echo $DOCKERFILE | sed -e ' s/\"/\\\"/g' )
167169
168- puts-step-sameline " Launching... "
170+ puts-step " Launching... "
169171URL=" {{ .deis_controller_protocol }}://{{ .deis_controller_host }}:{{ .deis_controller_port }}/api/hooks/build"
170172DATA=" {\" sha\" :\" $GIT_SHA \" ,\" receive_user\" :\" $USER \" ,\" receive_repo\" :\" $APP_NAME \" ,\" image\" :\" $IMAGE_REFERENCE \" ,\" procfile\" :\" $RELEASE_INFO \" ,\" dockerfile\" :\" $DOCKERFILE \" }"
171173
@@ -180,19 +182,18 @@ RELEASE=$(echo $RESPONSE | python -c 'import json,sys;obj=json.load(sys.stdin);p
180182
181183if [ " $RELEASE " == " $RESPONSE " ];
182184then
183- # we're printing inline with "Launching..."
184- echo " failed"
185+ puts-warn " ERROR: Failed to launch container"
185186 puts-warn $RESPONSE
186187 exit 1
187188fi
188189
189190DOMAIN=$( echo $RESPONSE | python -c ' import json,sys;obj=json.load(sys.stdin);print obj["domains"][0]' )
190- echo " done, v$RELEASE "
191- puts-step " $APP_NAME deployed to Deis"
191+ indent " done, $APP_NAME :v$RELEASE deployed to Deis"
192192echo
193193indent " http://$DOMAIN "
194194echo
195195indent " To learn more, use \` deis help\` or visit http://deis.io"
196+ echo
196197
197198# cleanup
198199cd $REPO_DIR
0 commit comments