From 85e0811332d835144480b8761c3550e1922c4d30 Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Mon, 9 Mar 2026 11:40:11 -0400 Subject: [PATCH 1/2] remove crash reports endpoint --- programs/server/config.xml | 2 +- programs/server/config.yaml.example | 2 +- tests/integration/test_config_xml_full/configs/config.xml | 2 +- tests/integration/test_config_xml_main/configs/config.xml | 2 +- tests/integration/test_config_xml_yaml_mix/configs/config.xml | 2 +- tests/integration/test_config_yaml_full/configs/config.yaml | 2 +- tests/integration/test_config_yaml_main/configs/config.yaml | 2 +- .../configs/config_send_crash_reports.xml | 2 +- tests/integration/test_send_crash_reports/fake_sentry_server.py | 2 +- utils/clickhouse-diagnostics/README.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/server/config.xml b/programs/server/config.xml index 2738e0c7a2d5..383bf21c1bda 100644 --- a/programs/server/config.xml +++ b/programs/server/config.xml @@ -1687,7 +1687,7 @@ false - https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277 + false diff --git a/programs/server/config.yaml.example b/programs/server/config.yaml.example index 5bfdb185d915..05ab8f19bd1f 100644 --- a/programs/server/config.yaml.example +++ b/programs/server/config.yaml.example @@ -939,6 +939,6 @@ send_crash_reports: anonymize: false # Default endpoint should be changed to different Sentry DSN only if you have # some in-house engineers or hired consultants who're going to debug ClickHouse issues for you - endpoint: 'https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277' + endpoint: '' # Uncomment to disable ClickHouse internal DNS caching. # disable_internal_dns_cache: 1 diff --git a/tests/integration/test_config_xml_full/configs/config.xml b/tests/integration/test_config_xml_full/configs/config.xml index ffa8eeb077e7..8c2df52ba876 100644 --- a/tests/integration/test_config_xml_full/configs/config.xml +++ b/tests/integration/test_config_xml_full/configs/config.xml @@ -995,7 +995,7 @@ false - https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277 + diff --git a/tests/integration/test_config_xml_main/configs/config.xml b/tests/integration/test_config_xml_main/configs/config.xml index 7f951e449028..c1b4815ac135 100644 --- a/tests/integration/test_config_xml_main/configs/config.xml +++ b/tests/integration/test_config_xml_main/configs/config.xml @@ -195,6 +195,6 @@ false false - https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277 + diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.xml index f1e5137ac001..cd8186acd765 100644 --- a/tests/integration/test_config_xml_yaml_mix/configs/config.xml +++ b/tests/integration/test_config_xml_yaml_mix/configs/config.xml @@ -195,7 +195,7 @@ false false - https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277 + 123451234 diff --git a/tests/integration/test_config_yaml_full/configs/config.yaml b/tests/integration/test_config_yaml_full/configs/config.yaml index 894f1a374676..94300e82b74b 100644 --- a/tests/integration/test_config_yaml_full/configs/config.yaml +++ b/tests/integration/test_config_yaml_full/configs/config.yaml @@ -133,5 +133,5 @@ query_masking_rules: send_crash_reports: enabled: false anonymize: false - endpoint: 'https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277' + endpoint: '' diff --git a/tests/integration/test_config_yaml_main/configs/config.yaml b/tests/integration/test_config_yaml_main/configs/config.yaml index e8483f95bb0e..6f55e908e681 100644 --- a/tests/integration/test_config_yaml_main/configs/config.yaml +++ b/tests/integration/test_config_yaml_main/configs/config.yaml @@ -133,5 +133,5 @@ query_masking_rules: send_crash_reports: enabled: false anonymize: false - endpoint: 'https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277' + endpoint: '' diff --git a/tests/integration/test_send_crash_reports/configs/config_send_crash_reports.xml b/tests/integration/test_send_crash_reports/configs/config_send_crash_reports.xml index d63b7b41ca20..eed680e03536 100644 --- a/tests/integration/test_send_crash_reports/configs/config_send_crash_reports.xml +++ b/tests/integration/test_send_crash_reports/configs/config_send_crash_reports.xml @@ -2,6 +2,6 @@ true true - http://6f33034cfe684dd7a3ab9875e57b1c8d@localhost:9500/5226277 + http://test-dsn@localhost:9500/1 diff --git a/tests/integration/test_send_crash_reports/fake_sentry_server.py b/tests/integration/test_send_crash_reports/fake_sentry_server.py index 37d733cc005d..f60786a3a2c6 100644 --- a/tests/integration/test_send_crash_reports/fake_sentry_server.py +++ b/tests/integration/test_send_crash_reports/fake_sentry_server.py @@ -18,7 +18,7 @@ def do_POST(self): + post_data.decode() ) elif ( - b'"http://6f33034cfe684dd7a3ab9875e57b1c8d@localhost:9500/5226277"' + b'"http://test-dsn@localhost:9500/1"' not in post_data ): f.write("INCORRECT_POST_DATA") diff --git a/utils/clickhouse-diagnostics/README.md b/utils/clickhouse-diagnostics/README.md index 01bb543c9a58..ed6d989006a8 100644 --- a/utils/clickhouse-diagnostics/README.md +++ b/utils/clickhouse-diagnostics/README.md @@ -235,7 +235,7 @@ Uptime: **13 minutes and 51 seconds** false false - https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277 + 0.0.0.0 8443 From 82e30540bd61d178e1226f9635924174cf40ab36 Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Thu, 19 Feb 2026 12:47:00 -0500 Subject: [PATCH 2/2] remove references to upstream from server/keeper dockerfile --- docker/keeper/Dockerfile | 14 ++----- docker/server/Dockerfile.alpine | 15 +++---- docker/server/Dockerfile.ubuntu | 74 ++------------------------------- tests/ci/docker_server.py | 4 +- 4 files changed, 13 insertions(+), 94 deletions(-) diff --git a/docker/keeper/Dockerfile b/docker/keeper/Dockerfile index 8f8cc46285b7..aae7fe7b524f 100644 --- a/docker/keeper/Dockerfile +++ b/docker/keeper/Dockerfile @@ -35,11 +35,8 @@ RUN arch=${TARGETARCH:-amd64} \ arm64) ln -sf /lib/ld-2.35.so /lib/ld-linux-aarch64.so.1 ;; \ esac -# lts / testing / prestable / etc -ARG REPO_CHANNEL="stable" -ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}" -ARG VERSION="25.2.2.39" -ARG PACKAGES="clickhouse-keeper" +# NOTE (strtgbb): Removed install methods other than direct URL install to tidy the Dockerfile + ARG DIRECT_DOWNLOAD_URLS="" # user/group precreated explicitly with fixed uid/gid on purpose. @@ -63,12 +60,7 @@ RUN arch=${TARGETARCH:-amd64} \ && wget -c -q "$url" \ ; done \ else \ - for package in ${PACKAGES}; do \ - cd /tmp \ - && echo "Get ${REPOSITORY}/${package}-${VERSION}-${arch}.tgz" \ - && wget -c -q "${REPOSITORY}/${package}-${VERSION}-${arch}.tgz" \ - && wget -c -q "${REPOSITORY}/${package}-${VERSION}-${arch}.tgz.sha512" \ - ; done \ + exit 1; \ fi \ && cat *.tgz.sha512 | sha512sum -c \ && for file in *.tgz; do \ diff --git a/docker/server/Dockerfile.alpine b/docker/server/Dockerfile.alpine index 5f1e10daf630..39fde82efda5 100644 --- a/docker/server/Dockerfile.alpine +++ b/docker/server/Dockerfile.alpine @@ -32,11 +32,10 @@ RUN arch=${TARGETARCH:-amd64} \ arm64) ln -sf /lib/ld-2.35.so /lib/ld-linux-aarch64.so.1 ;; \ esac -# lts / testing / prestable / etc -ARG REPO_CHANNEL="stable" -ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}" -ARG VERSION="25.2.2.39" -ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static" + + +# NOTE (strtgbb): Removed install methods other than direct URL install to tidy the Dockerfile + ARG DIRECT_DOWNLOAD_URLS="" # user/group precreated explicitly with fixed uid/gid on purpose. @@ -59,11 +58,7 @@ RUN arch=${TARGETARCH:-amd64} \ && wget -c -q "$url" \ ; done \ else \ - for package in ${PACKAGES}; do \ - echo "Get ${REPOSITORY}/${package}-${VERSION}-${arch}.tgz" \ - && wget -c -q "${REPOSITORY}/${package}-${VERSION}-${arch}.tgz" \ - && wget -c -q "${REPOSITORY}/${package}-${VERSION}-${arch}.tgz.sha512" \ - ; done \ + exit 1; \ fi \ && cat *.tgz.sha512 | sed 's:/output/:/tmp/:' | sha512sum -c \ && for file in *.tgz; do \ diff --git a/docker/server/Dockerfile.ubuntu b/docker/server/Dockerfile.ubuntu index 5a361319af73..bb6218b1a4a3 100644 --- a/docker/server/Dockerfile.ubuntu +++ b/docker/server/Dockerfile.ubuntu @@ -26,23 +26,12 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list wget \ && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/* -ARG REPO_CHANNEL="stable" -ARG REPOSITORY="deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb ${REPO_CHANNEL} main" -ARG VERSION="25.2.2.39" -ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static" - #docker-official-library:off # The part between `docker-official-library` tags is related to our builds -# set non-empty deb_location_url url to create a docker image -# from debs created by CI build, for example: -# docker build . --network host --build-arg version="21.4.1.6282" --build-arg deb_location_url="https://..." -t ... -ARG deb_location_url="" -ARG DIRECT_DOWNLOAD_URLS="" +# NOTE (strtgbb): Removed install methods other than direct URL install to tidy the Dockerfile -# set non-empty single_binary_location_url to create docker image -# from a single binary url (useful for non-standard builds - with sanitizers, for arm64). -ARG single_binary_location_url="" +ARG DIRECT_DOWNLOAD_URLS="" ARG TARGETARCH @@ -58,64 +47,7 @@ RUN if [ -n "${DIRECT_DOWNLOAD_URLS}" ]; then \ && rm -rf /tmp/* ; \ fi -# install from a web location with deb packages -RUN arch="${TARGETARCH:-amd64}" \ - && if [ -n "${deb_location_url}" ]; then \ - echo "installing from custom url with deb packages: ${deb_location_url}" \ - && rm -rf /tmp/clickhouse_debs \ - && mkdir -p /tmp/clickhouse_debs \ - && for package in ${PACKAGES}; do \ - { wget --progress=bar:force:noscroll "${deb_location_url}/${package}_${VERSION}_${arch}.deb" -P /tmp/clickhouse_debs || \ - wget --progress=bar:force:noscroll "${deb_location_url}/${package}_${VERSION}_all.deb" -P /tmp/clickhouse_debs ; } \ - || exit 1 \ - ; done \ - && dpkg -i /tmp/clickhouse_debs/*.deb \ - && rm -rf /tmp/* ; \ - fi - -# install from a single binary -RUN if [ -n "${single_binary_location_url}" ]; then \ - echo "installing from single binary url: ${single_binary_location_url}" \ - && rm -rf /tmp/clickhouse_binary \ - && mkdir -p /tmp/clickhouse_binary \ - && wget --progress=bar:force:noscroll "${single_binary_location_url}" -O /tmp/clickhouse_binary/clickhouse \ - && chmod +x /tmp/clickhouse_binary/clickhouse \ - && /tmp/clickhouse_binary/clickhouse install --user "clickhouse" --group "clickhouse" \ - && rm -rf /tmp/* ; \ - fi - -# The rest is the same in the official docker and in our build system -#docker-official-library:on - -# A fallback to installation from ClickHouse repository -# It works unless the clickhouse binary already exists -RUN clickhouse local -q 'SELECT 1' >/dev/null 2>&1 && exit 0 || : \ - ; apt-get update \ - && apt-get install --yes --no-install-recommends \ - dirmngr \ - gnupg2 \ - && mkdir -p /etc/apt/sources.list.d \ - && GNUPGHOME=$(mktemp -d) \ - && GNUPGHOME="$GNUPGHOME" gpg --batch --no-default-keyring \ - --keyring /usr/share/keyrings/clickhouse-keyring.gpg \ - --keyserver hkp://keyserver.ubuntu.com:80 \ - --recv-keys 3a9ea1193a97b548be1457d48919f6bd2b48d754 \ - && rm -rf "$GNUPGHOME" \ - && chmod +r /usr/share/keyrings/clickhouse-keyring.gpg \ - && echo "${REPOSITORY}" > /etc/apt/sources.list.d/clickhouse.list \ - && echo "installing from repository: ${REPOSITORY}" \ - && apt-get update \ - && for package in ${PACKAGES}; do \ - packages="${packages} ${package}=${VERSION}" \ - ; done \ - && apt-get install --yes --no-install-recommends ${packages} || exit 1 \ - && rm -rf \ - /var/lib/apt/lists/* \ - /var/cache/debconf \ - /tmp/* \ - && apt-get autoremove --purge -yq dirmngr gnupg2 \ - && chmod ugo+Xrw -R /etc/clickhouse-server /etc/clickhouse-client -# The last chmod is here to make the next one is No-op in docker official library Dockerfile +# NOTE (strtgbb): Removed install methods other than direct URL install to tidy the Dockerfile # post install # we need to allow "others" access to clickhouse folder, because docker container diff --git a/tests/ci/docker_server.py b/tests/ci/docker_server.py index c0bb7239affb..2abb41a5d60e 100644 --- a/tests/ci/docker_server.py +++ b/tests/ci/docker_server.py @@ -184,8 +184,8 @@ def buildx_args( args = [ f"--platform=linux/{arch}", f"--label=build-url={GITHUB_RUN_URL}", - f"--label=com.clickhouse.build.githash={git.sha}", - f"--label=com.clickhouse.build.version={version}", + f"--label=com.altinity.build.githash={git.sha}", + f"--label=com.altinity.build.version={version}", ] if direct_urls: args.append(f"--build-arg=DIRECT_DOWNLOAD_URLS='{' '.join(direct_urls)}'")