handle version in deployment from build

This commit is contained in:
beckerinj
2022-12-10 18:43:18 -05:00
parent 1884693ca6
commit 5559c3de42
2 changed files with 18 additions and 2 deletions

12
.vscode/tasks.json vendored
View File

@@ -91,7 +91,17 @@
"label": "docker compose down",
"options": {
"cwd": "${workspaceFolder}/tests"
}
},
"problemMatcher": []
},
{
"type": "shell",
"command": "docker compose build",
"label": "docker compose build",
"options": {
"cwd": "${workspaceFolder}/tests"
},
"problemMatcher": []
}
]
}

View File

@@ -166,7 +166,7 @@ impl State {
.await?;
if let Some(build_id) = &deployment.build_id {
let build = self.db.get_build(build_id).await?;
deployment.docker_run_args.image = if let Some(docker_account) = &build.docker_account {
let image = if let Some(docker_account) = &build.docker_account {
if deployment.docker_run_args.docker_account.is_none() {
deployment.docker_run_args.docker_account = Some(docker_account.to_string())
}
@@ -174,6 +174,12 @@ impl State {
} else {
to_monitor_name(&build.name)
};
let version = if let Some(version) = &deployment.build_version {
version.to_string()
} else {
"latest".to_string()
};
deployment.docker_run_args.image = format!("{image}:{version}");
};
let server = self.db.get_server(&deployment.server_id).await?;
let mut update = Update {