github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(app): push pull images

pull/3393/head
xAt0mZ 2019-11-21 14:37:57 +01:00
parent 527c52b715
commit d3d75423fb
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/docker/views/images/images.html
View File

@ -21,11 +21,16 @@
></por-image-registry> ></por-image-registry>
<!-- !image-and-registry --> <!-- !image-and-registry -->
<!-- tag-note --> <!-- tag-note -->
<div class="form-group"> <div class="form-group" ng-if="formValues.RegistryModel.UseRegistry">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="small text-muted">Note: if you don't specify the tag in the image name, <span class="label label-default">latest</span> will be used.</span> <span class="small text-muted">Note: if you don't specify the tag in the image name, <span class="label label-default">latest</span> will be used.</span>
</div> </div>
</div> </div>
<div class="form-group" ng-if="!formValues.RegistryModel.UseRegistry">
<div class="col-sm-12">
<span class="small text-muted"><i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i> WARNING: if you don't specify the tag in the image name, all tags will be pulled for the image.</span>
</div>
</div>
<!-- !tag-note --> <!-- !tag-note -->
<div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"> <div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
<div class="col-sm-12 form-section-title"> <div class="col-sm-12 form-section-title">
@ -39,7 +44,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<button type="button" class="btn btn-primary btn-sm" ng-disabled="state.actionInProgress || !formValues.Image" ng-click="pullImage()" button-spinner="state.actionInProgress"> <button type="button" class="btn btn-primary btn-sm" ng-disabled="state.actionInProgress || !formValues.RegistryModel.Image" ng-click="pullImage()" button-spinner="state.actionInProgress">
<span ng-hide="state.actionInProgress">Pull the image</span> <span ng-hide="state.actionInProgress">Pull the image</span>
<span ng-show="state.actionInProgress">Download in progress...</span> <span ng-show="state.actionInProgress">Download in progress...</span>
</button> </button>

1
app/docker/views/images/imagesController.js
View File

@ -14,7 +14,6 @@ function ($scope, $state, ImageService, Notifications, ModalService, HttpRequest
NodeName: null NodeName: null
}; };
// TODO CHANGE
$scope.pullImage = function() { $scope.pullImage = function() {
const registryModel = $scope.formValues.RegistryModel; const registryModel = $scope.formValues.RegistryModel;