development_username #4

Merged
mik-tf merged 2 commits from development_username into main 2024-10-03 06:54:33 +00:00
Showing only changes of commit 8d45ef4a4c - Show all commits

View File

@ -90,7 +90,7 @@ fn login() {
mut token_exists := os.exists(token_file)
mut docker_logged_in := false
docker_user_result := os.execute("sudo docker system info | grep 'Username' | cut -d ' ' -f 3")
docker_user_result := os.execute('docker-credential-$(jq -r .credsStore ~/.docker/config.json) list | jq -r \'. | to_entries[] | select(.key | contains("docker.io")) | last(.value)\' | head -n 1')
if docker_user_result.exit_code == 0 && docker_user_result.output.trim_space() != '' {
docker_logged_in = true
}
@ -142,7 +142,7 @@ fn logout() {
}
fn push(tag string) {
docker_user_result := os.execute("sudo docker system info | grep 'Username' | cut -d ' ' -f 3")
docker_user_result := os.execute('docker-credential-$(jq -r .credsStore ~/.docker/config.json) list | jq -r \'. | to_entries[] | select(.key | contains("docker.io")) | last(.value)\' | head -n 1')
if docker_user_result.exit_code != 0 || docker_user_result.output.trim_space() == '' {
error_message('Failed to get Docker username. Please ensure you are logged in to Docker.')
exit(1)