Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 12:25:22 +02:00
Code Issues Releases 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

12
api/http/handler/stacks/create_compose_stack.go
View file

@ -17,6 +17,7 @@ import (
type composeStackFromFileContentPayload struct {
Name string
StackFileContent string
Env []portainer.Pair
}
func (payload *composeStackFromFileContentPayload) Validate(r *http.Request) error {
@ -54,6 +55,7 @@ func (handler *Handler) createComposeStackFromFileContent(w http.ResponseWriter,
Type: portainer.DockerComposeStack,
EndpointID: endpoint.ID,
EntryPoint: filesystem.ComposeFileDefaultName,
Env: payload.Env,
}
stackFolder := strconv.Itoa(int(stack.ID))
@ -92,6 +94,7 @@ type composeStackFromGitRepositoryPayload struct {
RepositoryUsername string
RepositoryPassword string
ComposeFilePathInRepository string
Env []portainer.Pair
}
func (payload *composeStackFromGitRepositoryPayload) Validate(r *http.Request) error {
@ -135,6 +138,7 @@ func (handler *Handler) createComposeStackFromGitRepository(w http.ResponseWrite
Type: portainer.DockerComposeStack,
EndpointID: endpoint.ID,
EntryPoint: payload.ComposeFilePathInRepository,
Env: payload.Env,
}
projectPath := handler.FileService.GetStackProjectPath(strconv.Itoa(int(stack.ID)))
@ -177,6 +181,7 @@ func (handler *Handler) createComposeStackFromGitRepository(w http.ResponseWrite
type composeStackFromFileUploadPayload struct {
Name string
StackFileContent []byte
Env []portainer.Pair
}
func (payload *composeStackFromFileUploadPayload) Validate(r *http.Request) error {
@ -192,6 +197,12 @@ func (payload *composeStackFromFileUploadPayload) Validate(r *http.Request) erro
}
payload.StackFileContent = composeFileContent
var env []portainer.Pair
err = request.RetrieveMultiPartFormJSONValue(r, "Env", &env, true)
if err != nil {
return portainer.Error("Invalid Env parameter")
}
payload.Env = env
return nil
}
@ -220,6 +231,7 @@ func (handler *Handler) createComposeStackFromFileUpload(w http.ResponseWriter,
Type: portainer.DockerComposeStack,
EndpointID: endpoint.ID,
EntryPoint: filesystem.ComposeFileDefaultName,
Env: payload.Env,
}
stackFolder := strconv.Itoa(int(stack.ID))

3
api/http/handler/stacks/stack_update.go
View file

@ -15,6 +15,7 @@ import (
type updateComposeStackPayload struct {
StackFileContent string
Env []portainer.Pair
}
func (payload *updateComposeStackPayload) Validate(r *http.Request) error {
@ -112,6 +113,8 @@ func (handler *Handler) updateComposeStack(r *http.Request, stack *portainer.Sta
return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err}
}
stack.Env = payload.Env
stackFolder := strconv.Itoa(int(stack.ID))
_, err = handler.FileService.StoreStackFileFromBytes(stackFolder, stack.EntryPoint, []byte(payload.StackFileContent))
if err != nil {

21
api/libcompose/compose_stack.go
View file

@ -5,6 +5,7 @@ import (
"path"
"path/filepath"
"github.com/portainer/libcompose/config"
"github.com/portainer/libcompose/docker"
"github.com/portainer/libcompose/docker/client"
"github.com/portainer/libcompose/docker/ctx"
@ -35,19 +36,31 @@ func (manager *ComposeStackManager) Up(stack *portainer.Stack, endpoint *portain
TLSCAFile: endpoint.TLSCACertPath,
TLSCertFile: endpoint.TLSCertPath,
TLSKeyFile: endpoint.TLSKeyPath,
APIVersion: "1.24",
APIVersion: portainer.SupportedDockerAPIVersion,
})
if err != nil {
return err
}
env := make(map[string]string)
for _, envvar := range stack.Env {
env[envvar.Name] = envvar.Value
}
composeFilePath := path.Join(stack.ProjectPath, stack.EntryPoint)
proj, err := docker.NewProject(&ctx.Context{
ConfigDir: manager.dataPath,
Context: project.Context{
ComposeFiles: []string{composeFilePath},
EnvironmentLookup: &lookup.EnvfileLookup{
Path: filepath.Join(stack.ProjectPath, ".env"),
EnvironmentLookup: &lookup.ComposableEnvLookup{
Lookups: []config.EnvironmentLookup{
&lookup.EnvfileLookup{
Path: filepath.Join(stack.ProjectPath, ".env"),
},
&lookup.MapLookup{
Vars: env,
},
},
},
ProjectName: stack.Name,
},
@ -69,7 +82,7 @@ func (manager *ComposeStackManager) Down(stack *portainer.Stack, endpoint *porta
TLSCAFile: endpoint.TLSCACertPath,
TLSCertFile: endpoint.TLSCertPath,
TLSKeyFile: endpoint.TLSKeyPath,
APIVersion: "1.24",
APIVersion: portainer.SupportedDockerAPIVersion,
})
if err != nil {
return err