artin/self_hosted_sentry
1
0
Fork 0
mirror of https://github.com/getsentry/self-hosted.git synced 2026-02-06 10:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref(js-assets): Simplify how we call nginx container (#3761)

Browse Source
This commit is contained in:
Burak Yigit Kaya 2025-06-17 22:47:23 +01:00 committed by GitHub
parent 019d372df2
commit 433eed8fb7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_unit-test/js-sdk-assets-test.sh
View File

@ -9,9 +9,9 @@ export SETUP_JS_SDK_ASSETS=1
source install/setup-js-sdk-assets.sh
sdk_files=$($dcr --no-deps -v "sentry-nginx-www:/var/www" nginx ls -lah /var/www/js-sdk/)
sdk_tree=$($dcr --no-deps -v "sentry-nginx-www:/var/www" nginx tree /var/www/js-sdk/ | tail -n 1)
non_empty_file_count=$($dcr --no-deps -v "sentry-nginx-www:/var/www" nginx find /var/www/js-sdk/ -type f -size +1k | wc -l)
sdk_files=$($dcr --no-deps nginx ls -lah /var/www/js-sdk/)
sdk_tree=$($dcr --no-deps nginx tree /var/www/js-sdk/ | tail -n 1)
non_empty_file_count=$($dcr --no-deps nginx find /var/www/js-sdk/ -type f -size +1k | wc -l)
# `sdk_files` should contains 5 lines, '4.*', '5.*', '6.*', `7.*` and `8.*`
echo $sdk_files

8
install/setup-js-sdk-assets.sh
View File

@ -9,7 +9,7 @@ if [[ "${SETUP_JS_SDK_ASSETS:-}" == "1" ]]; then
# `SETUP_JS_SDK_KEEP_OLD_ASSETS` to any value.
if [[ -z "${SETUP_JS_SDK_KEEP_OLD_ASSETS:-}" ]]; then
echo "Cleaning up old JS SDK assets..."
$dcr --no-deps --rm -v "sentry-nginx-www:/var/www" nginx rm -rf /var/www/js-sdk/*
$dcr --no-deps nginx rm -rf /var/www/js-sdk/*
fi
$dbuild -t sentry-self-hosted-jq-local --platform="$DOCKER_PLATFORM" jq
@ -35,12 +35,12 @@ if [[ "${SETUP_JS_SDK_ASSETS:-}" == "1" ]]; then
variants="{bundle,bundle.tracing,bundle.tracing.replay,bundle.replay,bundle.tracing.replay.feedback,bundle.feedback}"
# Download those versions & variants using curl
$dcr --no-deps --rm -v "sentry-nginx-www:/var/www" nginx curl -w '%{response_code} %{url}\n' --no-progress-meter --compressed --retry 3 --create-dirs -fLo "/var/www/js-sdk/#1/#2.min.js" "https://browser.sentry-cdn.com/${versions}/${variants}.min.js" || true
$dcr --no-deps nginx curl -w '%{response_code} %{url}\n' --no-progress-meter --compressed --retry 3 --create-dirs -fLo "/var/www/js-sdk/#1/#2.min.js" "https://browser.sentry-cdn.com/${versions}/${variants}.min.js" || true
# Make sure permissions are correct
# See https://github.com/getsentry/self-hosted/issues/3614 for reported issue
$dcr --no-deps --rm -v "sentry-nginx-www:/var/www" nginx find /var/www/js-sdk -type d -exec chmod 755 {} \;
$dcr --no-deps --rm -v "sentry-nginx-www:/var/www" nginx find /var/www/js-sdk -type f -exec chmod 644 {} \;
$dcr --no-deps nginx find /var/www/js-sdk -type d -exec chmod 755 {} \;
$dcr --no-deps nginx find /var/www/js-sdk -type f -exec chmod 644 {} \;
echo "${_endgroup}"
fi