From 1137155331134f58d1f657b906ee33afa9db2d87 Mon Sep 17 00:00:00 2001 From: Brett Logan Date: Tue, 3 Jan 2023 23:18:52 -0500 Subject: [PATCH] Fix arm-ttk path Signed-off-by: Brett Logan --- Dockerfile | 1 + scripts/install-arm-ttk.sh | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dcde6c54..c6b048ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -398,6 +398,7 @@ ARG PSSA_VERSION='1.21.0' ################ # Set ENV vars # ################ +ENV ARM_TTK_PSD1="/usr/lib/microsoft/arm-ttk/arm-ttk.psd1" ENV IMAGE="standard" ENV PATH="${PATH}:/var/cache/dotnet/tools:/usr/share/dotnet" diff --git a/scripts/install-arm-ttk.sh b/scripts/install-arm-ttk.sh index 91fa8f6c..7dabcf6f 100755 --- a/scripts/install-arm-ttk.sh +++ b/scripts/install-arm-ttk.sh @@ -15,5 +15,7 @@ curl --retry 5 --retry-delay 5 -sL \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer ${GITHUB_TOKEN}" \ "${url}" | tar -xz -C /usr/lib/microsoft -chmod a+x /usr/lib/microsoft/*/arm-ttk/arm-ttk.psd1 -ln -sTf /usr/lib/microsoft/*/arm-ttk/arm-ttk.psd1 /usr/bin/arm-ttk +mv /usr/lib/microsoft/Azure-arm-ttk-*/arm-ttk /usr/lib/microsoft/arm-ttk +rm -rf /usr/lib/microsoft/Azure-arm-ttk-* +chmod a+x /usr/lib/microsoft/arm-ttk/arm-ttk.psd1 +ln -sTf /usr/lib/microsoft/arm-ttk/arm-ttk.psd1 /usr/bin/arm-ttk