From dfd27aed2b3d1fbd0894bdc9d50b80a9cd6d7dcf Mon Sep 17 00:00:00 2001 From: Matt Sawyer Date: Wed, 22 May 2024 15:12:03 -0700 Subject: [PATCH] fix sre-model-find-commit script --- home/.zshenv-KD21QWDKW7.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.zshenv-KD21QWDKW7.nix b/home/.zshenv-KD21QWDKW7.nix index 6c677c4..4efcd16 100644 --- a/home/.zshenv-KD21QWDKW7.nix +++ b/home/.zshenv-KD21QWDKW7.nix @@ -352,10 +352,10 @@ sre-model-find-commit() { return 1 fi export IFS=$'\n' - image_profile_files=($(rg -g'render*' -l "([\S]*_)?${service}_image:.*${service}@sha256.*" $sre_repo_dir)) + image_profile_files=($(rg -g'render*' -l "([\S]*_)?${service}_image:.*${service}@sha256:[a-z0-9]+" $sre_repo_dir)) for file in $image_profile_files; do image=$(pcregrep --buffer-size=64M "${service}_image:.*${service}@sha256" "$file") - image_url=$(echo "$image" | pcregrep -o 'volterra.azurecr.io.*') + image_url=$(echo "$image" | pcregrep -o 'volterra.azurecr.io.*sha256:[a-z0-9]+') image_key=$(echo "$image" | pcregrep -o "\w*${service}_image") if [[ -n "$image_url" ]]; then if [[ $# -eq 0 ]]; then @@ -581,7 +581,7 @@ docker-shell () { -v ${project_root}:${project_root} \ -v "${HOME}/.bashrc-docker-shell":"${HOME}/.bashrc" \ -w ${project_root} \ - ${image} ${cmd} + ${image} ${cmd} test -f "$temp_passwd_file" && rm -f "$temp_passwd_file" fi }