fix: Determine version variable from build.args Value, not Key

Author: boukeversteegh

.env

@@ -19,6 +19,7 @@ HELM_VERSION=3.8.1
 HTTPIE_VERSION=2.6.0
 HTTP_VERSION=${HTTPIE_VERSION}
 JAVA_VERSION=17.0.2
+LATEX_ALPINE_VERSION=${ALPINE_VERSION}
 LUA_IMAGE=nickblah/lua
 LUA_VERSION=5.4.3
 NODE_VERSION=17.7.2

docker-compose.yml

@@ -103,7 +103,7 @@ services:
       context: apps/alpine
       dockerfile: ../alpine/Dockerfile
       args:
-        ALPINE_VERSION: "${ALPINE_VERSION}"
+        ALPINE_VERSION: "${LATEX_ALPINE_VERSION}"
         ALPINE_PACKAGES: "texlive-full py-pygments gnuplot make git"
     entrypoint: [ "pdflatex" ]
   lua:

lib/dockerized.go

@@ -404,12 +404,6 @@ func setCommandVersion(dockerizedDockerComposeFilePath string, commandName strin
 		variablesUsed = append(variablesUsed, variable)
 	}
 
-	for _, entryPointArgument := range rawService.Entrypoint {
-		for _, entryPointVariable := range ExtractVariablesFromString(entryPointArgument) {
-			variablesUsed = append(variablesUsed, entryPointVariable)
-		}
-	}
-
 	if len(variablesUsed) == 0 {
 		fmt.Printf("Error: Version selection for %s is currently not supported.\n", commandName)
 		os.Exit(1)
@@ -431,7 +425,7 @@ func setCommandVersion(dockerizedDockerComposeFilePath string, commandName strin
 			)
 			os.Exit(1)
 		} else if len(versionVariablesUsed) > 1 {
-			fmt.Println("Multiple version variables found:")
+			fmt.Printf("Error: To specify the version of %s, please set one of:\n", commandName)
 			for _, versionVariable := range versionVariablesUsed {
 				fmt.Println("  " + versionVariable)
 			}
@@ -782,14 +776,22 @@ func ExtractVariables(rawService types.ServiceConfig) []string {
 		usedVariables = append(usedVariables, envKey)
 	}
 	if rawService.Build != nil {
-		for argKey := range rawService.Build.Args {
-			usedVariables = append(usedVariables, argKey)
+		for _, argValue := range rawService.Build.Args {
+			for _, argValueVariable := range ExtractVariablesFromString(*argValue) {
+				usedVariables = append(usedVariables, argValueVariable)
+			}
 		}
 	}
 	for _, imageVariable := range ExtractVariablesFromString(rawService.Image) {
 		usedVariables = append(usedVariables, imageVariable)
 	}
 
+	for _, entryPointArgument := range rawService.Entrypoint {
+		for _, entryPointVariable := range ExtractVariablesFromString(entryPointArgument) {
+			usedVariables = append(usedVariables, entryPointVariable)
+		}
+	}
+
 	usedVariables = unique(usedVariables)
 	sort.Strings(usedVariables)