blackroad-os/backroad
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(templates): support env variables in Compose stacks

Browse Source
This commit is contained in:
Anthony Lapenna
2018-07-12 09:17:07 +02:00
parent c8c54cf991
commit e15da005a5
8 changed files with 58 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/portainer/services/api/stackService.js
View File

@@ -223,8 +223,8 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic
return Stack.update({ endpointId: stack.EndpointId }, { id: stack.Id, StackFileContent: stackFile, Env: env, Prune: prune }).$promise;
};
service.createComposeStackFromFileUpload = function(name, stackFile, endpointId) {
return FileUploadService.createComposeStack(name, stackFile, endpointId);
service.createComposeStackFromFileUpload = function(name, stackFile, env, endpointId) {
return FileUploadService.createComposeStack(name, stackFile, env, endpointId);
};
service.createSwarmStackFromFileUpload = function(name, stackFile, env, endpointId) {
@@ -245,10 +245,11 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic
return deferred.promise;
};
service.createComposeStackFromFileContent = function(name, stackFileContent, endpointId) {
service.createComposeStackFromFileContent = function(name, stackFileContent, env, endpointId) {
var payload = {
Name: name,
StackFileContent: stackFileContent
StackFileContent: stackFileContent,
Env: env
};
return Stack.create({ method: 'string', type: 2, endpointId: endpointId }, payload).$promise;
};
@@ -277,14 +278,15 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic
return deferred.promise;
};
service.createComposeStackFromGitRepository = function(name, repositoryOptions, endpointId) {
service.createComposeStackFromGitRepository = function(name, repositoryOptions, env, endpointId) {
var payload = {
Name: name,
RepositoryURL: repositoryOptions.RepositoryURL,
ComposeFilePathInRepository: repositoryOptions.ComposeFilePathInRepository,
RepositoryAuthentication: repositoryOptions.RepositoryAuthentication,
RepositoryUsername: repositoryOptions.RepositoryUsername,
RepositoryPassword: repositoryOptions.RepositoryPassword
RepositoryPassword: repositoryOptions.RepositoryPassword,
Env: env
};
return Stack.create({ method: 'repository', type: 2, endpointId: endpointId }, payload).$promise;
};