diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt index 9cd347e2bb..eeef8c6f40 100644 --- a/cmake/autogenerated_versions.txt +++ b/cmake/autogenerated_versions.txt @@ -4,9 +4,9 @@ # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes. SET(VERSION_REVISION 22) SET(VERSION_MAJOR 1) -SET(VERSION_MINOR 5) -SET(VERSION_PATCH 18) +SET(VERSION_MINOR 6) +SET(VERSION_PATCH 0) SET(VERSION_GITHASH 46c8bc98b1440fb3f7327ff36e0be06826d1b66a) -SET(VERSION_DESCRIBE v1.5.18) -SET(VERSION_STRING 1.5.18) +SET(VERSION_DESCRIBE v1.6.0) +SET(VERSION_STRING 1.6.0) # end of autochange diff --git a/debian/changelog b/debian/changelog index 9eaab7b661..05bef8c126 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -proton (1.5.18) unstable; urgency=low +proton (1.6.0) unstable; urgency=low * Modified source code diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile index eb1f0f6e34..42ff3c0cef 100644 --- a/docker/client/Dockerfile +++ b/docker/client/Dockerfile @@ -5,25 +5,25 @@ ARG apt_archive="http://archive.ubuntu.com" RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list ARG repository="deb https://repo.clickhouse.com/deb/stable/ main/" -ARG version=1.5.18 +ARG version=1.6.0 RUN apt-get update \ && apt-get install --yes --no-install-recommends \ - apt-transport-https \ - ca-certificates \ - dirmngr \ - gnupg \ + apt-transport-https \ + ca-certificates \ + dirmngr \ + gnupg \ && mkdir -p /etc/apt/sources.list.d \ && apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 \ && echo $repository > /etc/apt/sources.list.d/clickhouse.list \ && apt-get update \ && env DEBIAN_FRONTEND=noninteractive \ - apt-get install --allow-unauthenticated --yes --no-install-recommends \ - clickhouse-client=$version \ - clickhouse-common-static=$version \ - locales \ - tzdata \ + apt-get install --allow-unauthenticated --yes --no-install-recommends \ + clickhouse-client=$version \ + clickhouse-common-static=$version \ + locales \ + tzdata \ && rm -rf /var/lib/apt/lists/* /var/cache/debconf \ && apt-get clean diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index fb6f125e2f..0aea7f78ac 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:20.04 # FIXME, XXX, timeplus deb repo # ARG repository="deb https://repo.timeplus/deb/stable/ main/" ARG repository="" -ARG version=1.5.18 +ARG version=1.6.0 ARG gosu_ver=1.10 # set non-empty deb_location_url url to create a docker image @@ -51,51 +51,51 @@ RUN groupadd -r timeplus --gid=101 \ && echo 'Acquire::ForceIPv4 "true";' > /etc/apt/apt.conf.d/99force-ipv4 \ && apt-get update \ && apt-get install --yes --no-install-recommends \ - apt-transport-https \ - ca-certificates \ - dirmngr \ - gnupg \ - locales \ - wget \ - curl \ - tzdata \ + apt-transport-https \ + ca-certificates \ + dirmngr \ + gnupg \ + locales \ + wget \ + curl \ + tzdata \ && mkdir -p /etc/apt/sources.list.d \ && apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 \ && echo $repository > /etc/apt/sources.list.d/proton.list \ && if [ -n "$deb_location_url" ]; then \ - echo "installing from custom url with deb packages: $deb_location_url" \ - rm -rf /tmp/proton_debs \ - && mkdir -p /tmp/proton_debs \ - && wget --progress=bar:force:noscroll "${deb_location_url}/proton-common-static_${version}_amd64.deb" -P /tmp/proton_debs \ - && wget --progress=bar:force:noscroll "${deb_location_url}/proton-client_${version}_all.deb" -P /tmp/proton_debs \ - && wget --progress=bar:force:noscroll "${deb_location_url}/proton-server_${version}_all.deb" -P /tmp/proton_debs \ - && dpkg -i /tmp/proton_debs/*.deb ; \ - elif [ -n "$single_binary_location_url" ]; then \ - echo "installing from single binary url: $single_binary_location_url" \ - && rm -rf /tmp/proton_binary \ - && mkdir -p /tmp/proton_binary \ - && wget --progress=bar:force:noscroll "$single_binary_location_url" -O /tmp/proton_binary/proton \ - && chmod +x /tmp/proton_binary/proton \ - && /tmp/proton_binary/proton install --user "timeplus" --group "timeplus" ; \ - else \ - echo "installing from repository: $repository" \ - && apt-get update \ - && apt-get --yes -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" upgrade \ - && apt-get install --allow-unauthenticated --yes --no-install-recommends \ - proton-common-static=$version \ - proton-client=$version \ - proton-server=$version ; \ - fi \ + echo "installing from custom url with deb packages: $deb_location_url" \ + rm -rf /tmp/proton_debs \ + && mkdir -p /tmp/proton_debs \ + && wget --progress=bar:force:noscroll "${deb_location_url}/proton-common-static_${version}_amd64.deb" -P /tmp/proton_debs \ + && wget --progress=bar:force:noscroll "${deb_location_url}/proton-client_${version}_all.deb" -P /tmp/proton_debs \ + && wget --progress=bar:force:noscroll "${deb_location_url}/proton-server_${version}_all.deb" -P /tmp/proton_debs \ + && dpkg -i /tmp/proton_debs/*.deb ; \ + elif [ -n "$single_binary_location_url" ]; then \ + echo "installing from single binary url: $single_binary_location_url" \ + && rm -rf /tmp/proton_binary \ + && mkdir -p /tmp/proton_binary \ + && wget --progress=bar:force:noscroll "$single_binary_location_url" -O /tmp/proton_binary/proton \ + && chmod +x /tmp/proton_binary/proton \ + && /tmp/proton_binary/proton install --user "timeplus" --group "timeplus" ; \ + else \ + echo "installing from repository: $repository" \ + && apt-get update \ + && apt-get --yes -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" upgrade \ + && apt-get install --allow-unauthenticated --yes --no-install-recommends \ + proton-common-static=$version \ + proton-client=$version \ + proton-server=$version ; \ + fi \ && apt-get install -y --no-install-recommends tcc libc-dev && \ - tcc /su-exec.c -o /bin/su-exec && \ - chown root:root /bin/su-exec && \ - chmod 0755 /bin/su-exec && \ - rm /su-exec.c && \ - apt-get purge -y --auto-remove tcc libc-dev libc-dev-bin libc6-dev linux-libc-dev \ + tcc /su-exec.c -o /bin/su-exec && \ + chown root:root /bin/su-exec && \ + chmod 0755 /bin/su-exec && \ + rm /su-exec.c && \ + apt-get purge -y --auto-remove tcc libc-dev libc-dev-bin libc6-dev linux-libc-dev \ && rm -rf \ - /var/lib/apt/lists/* \ - /var/cache/debconf \ - /tmp/* \ + /var/lib/apt/lists/* \ + /var/cache/debconf \ + /tmp/* \ && apt-get clean \ && mkdir -p /var/lib/proton /var/log/proton-server /etc/proton-server /etc/proton-client \ && chmod ugo+Xrw -R /var/lib/proton /var/log/proton-server /etc/proton-server /etc/proton-client diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index 5c07c6f149..4f28a7f260 100644 --- a/docker/test/Dockerfile +++ b/docker/test/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 ARG repository="deb https://repo.clickhouse.com/deb/stable/ main/" -ARG version=1.5.18 +ARG version=1.6.0 RUN apt-get update && \ apt-get install -y apt-transport-https dirmngr && \