Ensure swagger, psql, rustc, tsc can set their version through :version syntax

Author: boukeversteegh

.env

@@ -27,15 +27,18 @@ PROTOC_VERSION=3.9.1
 PROTOC_ARCH=${DEFAULT_ARCH}
 PROTOC_BASE=${DEFAULT_BASE}
 POSTGRES_VERSION=14.2
+PSQL_VERSION=${POSTGRES_VERSION}
 PYTHON_VERSION=3.10
 PYTHON2_VERSION=2.7.18
 RUBY_VERSION=3.1.1
 RUST_VERSION=1.59.0
+RUSTC_VERSION=${RUST_VERSION}
 S3CMD_BASE=python:${PYTHON_VERSION}-${DEFAULT_BASE_IMAGE}
 S3CMD_VERSION=2.2.0
 SWAGGER_CODEGEN_VERSION=3.0.29
 SWIPL_VERSION=8.5.5
 TYPESCRIPT_VERSION=4.6.2
 TSC_VERSION=${TYPESCRIPT_VERSION}
+TSC_VERSION=${TYPESCRIPT_VERSION}
 VUE_VERSION=5.0.1
 YOUTUBE_DL_VERSION=2022.03.08.2

docker-compose.yml

@@ -113,7 +113,7 @@ services:
   php:
     image: "php:${PHP_VERSION}"
   psql:
-    image: "postgres:${POSTGRES_VERSION}"
+    image: "postgres:${PSQL_VERSION}"
     entrypoint: [ "psql" ]
   protoc:
     image: "protoc:${PROTOC_VERSION}"
@@ -145,7 +145,7 @@ services:
     <<: *ruby
     entrypoint: [ "gem" ]
   rustc:
-    image: "rust:${RUST_VERSION}"
+    image: "rust:${RUSTC_VERSION}"
     entrypoint: [ "rustc" ]
   s3cmd:
     build:

lib/dockerized.go

@@ -86,7 +86,7 @@ func main() {
 
 		rawService, err := rawProject.GetService(commandName)
 
-		var versionVariableExpected = strings.ToUpper(commandName) + "_VERSION"
+		var versionVariableExpected = strings.ReplaceAll(strings.ToUpper(commandName), "-", "_") + "_VERSION"
 		var versionVariablesUsed []string
 		for _, variable := range ExtractVariables(rawService) {
 			if strings.HasSuffix(variable, "_VERSION") {