Skip to content

Commit 433eed8

Browse files
authored
ref(js-assets): Simplify how we call nginx container (#3761)
1 parent 019d372 commit 433eed8

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

_unit-test/js-sdk-assets-test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ export SETUP_JS_SDK_ASSETS=1
99

1010
source install/setup-js-sdk-assets.sh
1111

12-
sdk_files=$($dcr --no-deps -v "sentry-nginx-www:/var/www" nginx ls -lah /var/www/js-sdk/)
13-
sdk_tree=$($dcr --no-deps -v "sentry-nginx-www:/var/www" nginx tree /var/www/js-sdk/ | tail -n 1)
14-
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)
12+
sdk_files=$($dcr --no-deps nginx ls -lah /var/www/js-sdk/)
13+
sdk_tree=$($dcr --no-deps nginx tree /var/www/js-sdk/ | tail -n 1)
14+
non_empty_file_count=$($dcr --no-deps nginx find /var/www/js-sdk/ -type f -size +1k | wc -l)
1515

1616
# `sdk_files` should contains 5 lines, '4.*', '5.*', '6.*', `7.*` and `8.*`
1717
echo $sdk_files

install/setup-js-sdk-assets.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if [[ "${SETUP_JS_SDK_ASSETS:-}" == "1" ]]; then
99
# `SETUP_JS_SDK_KEEP_OLD_ASSETS` to any value.
1010
if [[ -z "${SETUP_JS_SDK_KEEP_OLD_ASSETS:-}" ]]; then
1111
echo "Cleaning up old JS SDK assets..."
12-
$dcr --no-deps --rm -v "sentry-nginx-www:/var/www" nginx rm -rf /var/www/js-sdk/*
12+
$dcr --no-deps nginx rm -rf /var/www/js-sdk/*
1313
fi
1414

1515
$dbuild -t sentry-self-hosted-jq-local --platform="$DOCKER_PLATFORM" jq
@@ -35,12 +35,12 @@ if [[ "${SETUP_JS_SDK_ASSETS:-}" == "1" ]]; then
3535
variants="{bundle,bundle.tracing,bundle.tracing.replay,bundle.replay,bundle.tracing.replay.feedback,bundle.feedback}"
3636

3737
# Download those versions & variants using curl
38-
$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
38+
$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
3939

4040
# Make sure permissions are correct
4141
# See https://github.com/getsentry/self-hosted/issues/3614 for reported issue
42-
$dcr --no-deps --rm -v "sentry-nginx-www:/var/www" nginx find /var/www/js-sdk -type d -exec chmod 755 {} \;
43-
$dcr --no-deps --rm -v "sentry-nginx-www:/var/www" nginx find /var/www/js-sdk -type f -exec chmod 644 {} \;
42+
$dcr --no-deps nginx find /var/www/js-sdk -type d -exec chmod 755 {} \;
43+
$dcr --no-deps nginx find /var/www/js-sdk -type f -exec chmod 644 {} \;
4444

4545
echo "${_endgroup}"
4646
fi

0 commit comments

Comments
 (0)