Make the squashed path smaller and handle failure cases on the curl side

This commit is contained in:
Joseph Schorr 2014-09-19 12:54:52 -04:00
parent 9003670826
commit e5055763f6
3 changed files with 4 additions and 5 deletions

View file

@ -422,9 +422,8 @@ function RepoCtrl($scope, $sanitize, Restangular, ImageMetadataService, ApiServi
});
if ($scope.currentTag) {
var squash = 'curl ' + Config.getHost('ACCOUNTNAME:PASSWORDORTOKEN');
squash += '/verbs/v1/repositories/' + namespace + '/' + name + '/';
squash += $scope.currentTag.name + '/squash';
var squash = 'curl -f ' + Config.getHost('ACCOUNTNAME:PASSWORDORTOKEN');
squash += '/c1/squash/' + namespace + '/' + name + '/' + $scope.currentTag.name;
squash += ' | docker load';
$scope.pullCommands.push({