scottk/secureblue
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/secureblue.git synced 2025-11-06 21:37:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: add image tag warning to advise users not to use specific tags"

Browse Source 
This reverts commit 3dc08c057c.
This commit is contained in:
qoijjj
2024-03-21 14:12:24 -07:00
parent 12051fc5b5
commit f7856e7098
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/files/usr/libexec/deprecated-images.json
View File

@@ -3,8 +3,5 @@
"framework", "framework",
"main-laptop", "main-laptop",
"nvidia-laptop" "nvidia-laptop"
],
"imageTags": [
"39"
] ]
} }

12
config/files/usr/libexec/ublue-motd
View File

@@ -15,6 +15,7 @@ DIFFERENCE=$((CURRENT_SECONDS - IMAGE_DATE_SECONDS))
MONTH=$((7 * 24 * 60 * 60)) MONTH=$((7 * 24 * 60 * 60))
readarray -t imageTypes < <(jq -r '.imageTypes[]' /usr/libexec/deprecated-images.json) readarray -t imageTypes < <(jq -r '.imageTypes[]' /usr/libexec/deprecated-images.json)
isDeprecated=false isDeprecated=false
for imageType in "${imageTypes[@]}"; do for imageType in "${imageTypes[@]}"; do
if [[ "$IMAGE_REF_NAME" == *"$imageType"* ]]; then if [[ "$IMAGE_REF_NAME" == *"$imageType"* ]]; then
@@ -23,19 +24,8 @@ for imageType in "${imageTypes[@]}"; do
fi fi
done done
readarray -t imageTags < <(jq -r '.imageTags[]' /usr/libexec/deprecated-images.json)
isOnSpecificTag=false
for imageTag in "${imageTags[@]}"; do
if [[ "$IMAGE_TAG" == *"$imageTag"* ]]; then
isOnSpecificTag=true
break
fi
done
if $isDeprecated; then if $isDeprecated; then
TIP='~~~ NOTICE: You are on a deprecated image, please rebase. ~~~\n~~~ For more information, visit https://github.com/secureblue/secureblue/blob/live/config/files/usr/libexec/deprecated-images.json.md ~~~' TIP='~~~ NOTICE: You are on a deprecated image, please rebase. ~~~\n~~~ For more information, visit https://github.com/secureblue/secureblue/blob/live/config/files/usr/libexec/deprecated-images.json.md ~~~'
elif $isOnSpecificTag; then
TIP='~~~ NOTICE: You are on a specific tag, which is unsupported by secureblue. Rebase to the `latest` tag to ensure you continue to receive updates. ~~~'
elif [ "$DIFFERENCE" -ge "$MONTH" ]; then elif [ "$DIFFERENCE" -ge "$MONTH" ]; then
TIP='~~~ NOTICE: Your current image is over 1 week old, run `ujust update`. ~~~' TIP='~~~ NOTICE: Your current image is over 1 week old, run `ujust update`. ~~~'
else else