Merge remote-tracking branch 'origin/master' into whogoesthere

This commit is contained in:
Jake Moshenko 2014-09-03 12:34:07 -04:00
commit 58b244ca8c

View file

@ -2464,7 +2464,10 @@ quayApp.directive('dockerAuthDialog', function (Config) {
},
controller: function($scope, $element) {
var updateCommand = function() {
$scope.command = 'docker login -e="." -u="' + $scope.username +
var escape = function(v) {
return v.replace('$', '\\$');
};
$scope.command = 'docker login -e="." -u="' + escape($scope.username) +
'" -p="' + $scope.token + '" ' + Config['SERVER_HOSTNAME'];
};