From 22233af8b4a79a867e79dca01039530f01d82842 Mon Sep 17 00:00:00 2001 From: Reinaldy Rafli Date: Sun, 4 Oct 2026 17:27:48 +0700 Subject: [PATCH 1/2] feat: use prebuilt jqlang/jq image Why do we even have this one here, while we can just use the 'official' image? --- _unit-test/_test_setup.sh | 1 - install/error-handling.sh | 4 +--- install/setup-js-sdk-assets.sh | 4 +--- jq/Dockerfile | 11 ----------- 4 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 jq/Dockerfile diff --git a/_unit-test/_test_setup.sh b/_unit-test/_test_setup.sh index 8572dd8a329..f88c52bea12 100644 --- a/_unit-test/_test_setup.sh +++ b/_unit-test/_test_setup.sh @@ -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 report_success() { echo "$(basename $0) - Success 👍" diff --git a/install/error-handling.sh b/install/error-handling.sh index 040c2a9e252..21e0732c31f 100644 --- a/install/error-handling.sh +++ b/install/error-handling.sh @@ -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 diff --git a/install/setup-js-sdk-assets.sh b/install/setup-js-sdk-assets.sh index f576e273c43..fb7796a3fd8 100644 --- a/install/setup-js-sdk-assets.sh +++ b/install/setup-js-sdk-assets.sh @@ -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. diff --git a/jq/Dockerfile b/jq/Dockerfile deleted file mode 100644 index cbaa150061d..00000000000 --- a/jq/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM debian:bookworm-slim - -LABEL MAINTAINER="oss@sentry.io" - -RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends jq \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -ENTRYPOINT ["jq"] From 23f80f3dcc7af223740f10cae05cc9219aab8f86 Mon Sep 17 00:00:00 2001 From: Reinaldy Rafli Date: Wed, 7 Oct 2026 16:55:06 +0700 Subject: [PATCH 2/2] tests: replace to busybox --- _unit-test/setup-custom-ca-certificate-test.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/_unit-test/setup-custom-ca-certificate-test.sh b/_unit-test/setup-custom-ca-certificate-test.sh index 626000ba260..baf99f23927 100755 --- a/_unit-test/setup-custom-ca-certificate-test.sh +++ b/_unit-test/setup-custom-ca-certificate-test.sh @@ -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