Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions pkg/dockerized.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,7 @@ func SetCommandVersion(composeFilePaths []string, commandName string, optionVerb

var versionVariableExpected = strings.ReplaceAll(strings.ToUpper(commandName), "-", "_") + "_VERSION"
var variablesUsed []string
for _, variable := range ExtractVariables(rawService) {
variablesUsed = append(variablesUsed, variable)
}
variablesUsed = append(variablesUsed, ExtractVariables(rawService)...)

if len(variablesUsed) == 0 {
fmt.Printf("Error: Version selection for %s is currently not supported.\n", commandName)
Expand Down Expand Up @@ -572,19 +570,13 @@ func ExtractVariables(rawService types.ServiceConfig) []string {
}
if rawService.Build != nil {
for _, argValue := range rawService.Build.Args {
for _, argValueVariable := range ExtractVariablesFromString(*argValue) {
usedVariables = append(usedVariables, argValueVariable)
}
usedVariables = append(usedVariables, ExtractVariablesFromString(*argValue)...)
}
}
for _, imageVariable := range ExtractVariablesFromString(rawService.Image) {
usedVariables = append(usedVariables, imageVariable)
}
usedVariables = append(usedVariables, ExtractVariablesFromString(rawService.Image)...)

for _, entryPointArgument := range rawService.Entrypoint {
for _, entryPointVariable := range ExtractVariablesFromString(entryPointArgument) {
usedVariables = append(usedVariables, entryPointVariable)
}
usedVariables = append(usedVariables, ExtractVariablesFromString(entryPointArgument)...)
}

usedVariables = unique(usedVariables)
Expand Down