Skip to content

Commit 34749db

Browse files
Ensure swagger, psql, rustc, tsc can set their version through :version syntax
1 parent fdb9e16 commit 34749db

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.env

+3
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,18 @@ PROTOC_VERSION=3.9.1
2727
PROTOC_ARCH=${DEFAULT_ARCH}
2828
PROTOC_BASE=${DEFAULT_BASE}
2929
POSTGRES_VERSION=14.2
30+
PSQL_VERSION=${POSTGRES_VERSION}
3031
PYTHON_VERSION=3.10
3132
PYTHON2_VERSION=2.7.18
3233
RUBY_VERSION=3.1.1
3334
RUST_VERSION=1.59.0
35+
RUSTC_VERSION=${RUST_VERSION}
3436
S3CMD_BASE=python:${PYTHON_VERSION}-${DEFAULT_BASE_IMAGE}
3537
S3CMD_VERSION=2.2.0
3638
SWAGGER_CODEGEN_VERSION=3.0.29
3739
SWIPL_VERSION=8.5.5
3840
TYPESCRIPT_VERSION=4.6.2
3941
TSC_VERSION=${TYPESCRIPT_VERSION}
42+
TSC_VERSION=${TYPESCRIPT_VERSION}
4043
VUE_VERSION=5.0.1
4144
YOUTUBE_DL_VERSION=2022.03.08.2

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ services:
113113
php:
114114
image: "php:${PHP_VERSION}"
115115
psql:
116-
image: "postgres:${POSTGRES_VERSION}"
116+
image: "postgres:${PSQL_VERSION}"
117117
entrypoint: [ "psql" ]
118118
protoc:
119119
image: "protoc:${PROTOC_VERSION}"
@@ -145,7 +145,7 @@ services:
145145
<<: *ruby
146146
entrypoint: [ "gem" ]
147147
rustc:
148-
image: "rust:${RUST_VERSION}"
148+
image: "rust:${RUSTC_VERSION}"
149149
entrypoint: [ "rustc" ]
150150
s3cmd:
151151
build:

lib/dockerized.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func main() {
8686

8787
rawService, err := rawProject.GetService(commandName)
8888

89-
var versionVariableExpected = strings.ToUpper(commandName) + "_VERSION"
89+
var versionVariableExpected = strings.ReplaceAll(strings.ToUpper(commandName), "-", "_") + "_VERSION"
9090
var versionVariablesUsed []string
9191
for _, variable := range ExtractVariables(rawService) {
9292
if strings.HasSuffix(variable, "_VERSION") {

0 commit comments

Comments
 (0)