Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion _unit-test/_test_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ rm -rf /tmp/sentry-self-hosted-test-sandbox.*
_SANDBOX="$(mktemp -d /tmp/sentry-self-hosted-test-sandbox.XXX)"

source install/detect-platform.sh
docker build -t sentry-self-hosted-jq-local --platform="$DOCKER_PLATFORM" jq
Comment thread
cursor[bot] marked this conversation as resolved.

report_success() {
echo "$(basename $0) - Success 👍"
Expand Down
15 changes: 7 additions & 8 deletions _unit-test/setup-custom-ca-certificate-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,16 @@ echo "Pass: invalid certificate causes a non-zero exit"
# -----------------------------------------------------------------------
# Test 4: Happy path — valid cert, flag set.
#
# We override all image vars to sentry-self-hosted-jq-local (guaranteed
# present after _test_setup.sh) so the test runs without pulling large
# We override all image vars to busybox so the test runs without pulling large
# upstream images. The jq image has no /etc/ssl/certs, so the script uses
# an empty baseline and overlays our custom cert on top.
# -----------------------------------------------------------------------
export RELAY_IMAGE=sentry-self-hosted-jq-local
export SYMBOLICATOR_IMAGE=sentry-self-hosted-jq-local
export SNUBA_IMAGE=sentry-self-hosted-jq-local
export VROOM_IMAGE=sentry-self-hosted-jq-local
export TASKBROKER_IMAGE=sentry-self-hosted-jq-local
export UPTIME_CHECKER_IMAGE=sentry-self-hosted-jq-local
export RELAY_IMAGE=busybox
export SYMBOLICATOR_IMAGE=busybox
export SNUBA_IMAGE=busybox
export VROOM_IMAGE=busybox
export TASKBROKER_IMAGE=busybox
export UPTIME_CHECKER_IMAGE=busybox

export SETUP_CUSTOM_CA_CERTIFICATE=1
source install/setup-custom-ca-certificate.sh
Expand Down
4 changes: 1 addition & 3 deletions install/error-handling.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ if [ -z "${SENTRY_DSN:-}" ]; then
export SENTRY_DSN='https://19555c489ded4769978daae92f2346ca@self-hosted.getsentry.net/3'
fi

$dbuild -t sentry-self-hosted-jq-local --platform="$DOCKER_PLATFORM" jq

jq="$CONTAINER_ENGINE run --rm -i sentry-self-hosted-jq-local"
jq="$CONTAINER_ENGINE run --rm -i ghcr.io/jqlang/jq"
sentry_cli="$CONTAINER_ENGINE run --rm -v /tmp:/work -e SENTRY_DSN=$SENTRY_DSN getsentry/sentry-cli"
DEFAULT_BREADCRUMB_LINE_LIMIT=200

Expand Down
4 changes: 1 addition & 3 deletions install/setup-js-sdk-assets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ if [[ "${SETUP_JS_SDK_ASSETS:-}" == "1" ]]; then
$dcr --no-deps nginx rm -rf /var/www/js-sdk/*
fi

$dbuild -t sentry-self-hosted-jq-local --platform="$DOCKER_PLATFORM" jq

jq="$CONTAINER_ENGINE run --rm -i sentry-self-hosted-jq-local"
jq="$CONTAINER_ENGINE run --rm -i ghcr.io/jqlang/jq"

loader_registry=$($dcr --no-deps --rm -T web python3 -m json.tool /usr/src/sentry/src/sentry/loader/_registry.json)
# The `loader_registry` should start with "Updating certificates...", we want to delete that and the subsequent ca-certificates related lines.
Expand Down
11 changes: 0 additions & 11 deletions jq/Dockerfile

This file was deleted.

Loading