Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-07 06:45:23 +02:00
Code Issues Releases Activity

feat(app): push pull service creation

Browse source
This commit is contained in:
xAt0mZ 2019-11-21 18:08:36 +01:00
parent 507158e69c
commit e92dcd1450
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/docker/views/services/create/createServiceController.js
View file

@ -159,7 +159,6 @@ function ($q, $scope, $state, $timeout, Service, ServiceHelper, ConfigService, C
$scope.formValues.LogDriverOpts.splice(index, 1); $scope.formValues.LogDriverOpts.splice(index, 1);
}; };
// TODO CHANGE
function prepareImageConfig(config, input) { function prepareImageConfig(config, input) {
var imageConfig = ImageHelper.createImageConfigForContainer(input.RegistryModel); var imageConfig = ImageHelper.createImageConfigForContainer(input.RegistryModel);
config.TaskTemplate.ContainerSpec.Image = imageConfig.fromImage; config.TaskTemplate.ContainerSpec.Image = imageConfig.fromImage;
@ -427,11 +426,9 @@ function ($q, $scope, $state, $timeout, Service, ServiceHelper, ConfigService, C
return config; return config;
} }
// TODO CHANGE
function createNewService(config, accessControlData) { function createNewService(config, accessControlData) {
const registryModel = $scope.formValues.RegistryModel;
var registry = $scope.formValues.Registry; var authenticationDetails = registryModel.Registry.Authentication ? RegistryService.encodedCredentials(registryModel.Registry) : '';
var authenticationDetails = registry.Authentication ? RegistryService.encodedCredentials(registry) : '';
HttpRequestHelper.setRegistryAuthenticationHeader(authenticationDetails); HttpRequestHelper.setRegistryAuthenticationHeader(authenticationDetails);
Service.create(config).$promise Service.create(config).$promise

2
app/docker/views/services/create/createservice.html
View file

@ -125,7 +125,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="create()" button-spinner="state.actionInProgress"> <button type="button" class="btn btn-primary btn-sm" ng-disabled="state.actionInProgress || !formValues.RegistryModel.Image" ng-click="create()" button-spinner="state.actionInProgress">
<span ng-hide="state.actionInProgress">Create the service</span> <span ng-hide="state.actionInProgress">Create the service</span>
<span ng-show="state.actionInProgress">Creating service...</span> <span ng-show="state.actionInProgress">Creating service...</span>
</button> </button>

2
app/portainer/services/api/registryService.js
View file

@ -111,5 +111,3 @@ function RegistryServiceFactory($q, $async, Registries, DockerHubService, ImageH
return service; return service;
}]); }]);
// retrieveRegistryFromRepository