diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml index 78edbce6df4c..6df45dfdf8d0 100644 --- a/.github/workflows/release_branches.yml +++ b/.github/workflows/release_branches.yml @@ -29,6 +29,7 @@ on: # yamllint disable-line rule:truthy push: branches: - 'releases/24.8**' + - 'customizations/24.8**' tags: - '*' workflow_dispatch: diff --git a/docker/keeper/Dockerfile b/docker/keeper/Dockerfile index d422a00b93fd..fe73f85b9663 100644 --- a/docker/keeper/Dockerfile +++ b/docker/keeper/Dockerfile @@ -31,11 +31,8 @@ RUN arch=${TARGETARCH:-amd64} \ arm64) ln -sf /lib/ld-2.31.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="24.7.3.42" -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. @@ -59,12 +56,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 2565828c8463..0f57d169d0c0 100644 --- a/docker/server/Dockerfile.alpine +++ b/docker/server/Dockerfile.alpine @@ -29,11 +29,10 @@ RUN arch=${TARGETARCH:-amd64} \ arm64) ln -sf /lib/ld-2.31.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="24.7.3.42" -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. @@ -56,11 +55,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 2634b08d92fa..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="24.7.3.42" -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/programs/server/config.xml b/programs/server/config.xml index 10ad831465ac..f71474fd0341 100644 --- a/programs/server/config.xml +++ b/programs/server/config.xml @@ -1612,7 +1612,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 5d5499f876c7..1529e9c092df 100644 --- a/programs/server/config.yaml.example +++ b/programs/server/config.yaml.example @@ -924,6 +924,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/ci/docker_server.py b/tests/ci/docker_server.py index 18a3140f6191..f4f4c1a037b8 100644 --- a/tests/ci/docker_server.py +++ b/tests/ci/docker_server.py @@ -189,8 +189,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)}'") diff --git a/tests/integration/test_config_xml_full/configs/config.xml b/tests/integration/test_config_xml_full/configs/config.xml index 61aa0a5c7245..dfb35299d4f0 100644 --- a/tests/integration/test_config_xml_full/configs/config.xml +++ b/tests/integration/test_config_xml_full/configs/config.xml @@ -1009,7 +1009,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 54fc590fc245..3deafe23eb92 100644 --- a/tests/integration/test_config_xml_main/configs/config.xml +++ b/tests/integration/test_config_xml_main/configs/config.xml @@ -209,6 +209,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 13e51581ba4d..8bc6bedbd6e4 100644 --- a/tests/integration/test_config_xml_yaml_mix/configs/config.xml +++ b/tests/integration/test_config_xml_yaml_mix/configs/config.xml @@ -209,7 +209,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 3bc8ccdf6019..f812ad91763b 100644 --- a/tests/integration/test_config_yaml_full/configs/config.yaml +++ b/tests/integration/test_config_yaml_full/configs/config.yaml @@ -143,5 +143,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 6e62b13a0eeb..370eb31bd3f2 100644 --- a/tests/integration/test_config_yaml_main/configs/config.yaml +++ b/tests/integration/test_config_yaml_main/configs/config.yaml @@ -143,5 +143,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