thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 01:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix25

Browse Source
This commit is contained in:
proller 2019-09-06 23:15:08 +03:00
commit ca32782adb
6 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/tests/queries/0_stateless/00975_recursive_materialized_view.sql
View File

@ -1,5 +1,6 @@
DROP TABLE IF EXISTS test.src; DROP TABLE IF EXISTS test.src;
DROP TABLE IF EXISTS test.dst1; DROP TABLE IF EXISTS test.dst1;
DROP TABLE IF EXISTS test.src_to_dst1;
DROP TABLE IF EXISTS test.dst2; DROP TABLE IF EXISTS test.dst2;
USE test; USE test;

0
dbms/tests/queries/0_stateless/00993_system_parts_race_condition_drop.reference → dbms/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.reference
View File

0
dbms/tests/queries/0_stateless/00993_system_parts_race_condition_drop.sh → dbms/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
View File

12
docker/packager/binary/Dockerfile
View File

@ -6,14 +6,19 @@ RUN apt-get --allow-unauthenticated update -y \
apt-get --allow-unauthenticated install --yes --no-install-recommends \ apt-get --allow-unauthenticated install --yes --no-install-recommends \
bash \ bash \
fakeroot \ fakeroot \
cmake \
ccache \ ccache \
curl \ curl \
software-properties-common software-properties-common \
gnupg \
apt-transport-https \
ca-certificates
RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main" >> /etc/apt/sources.list RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main" >> /etc/apt/sources.list
RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list
RUN add-apt-repository ppa:ubuntu-toolchain-r/test RUN add-apt-repository ppa:ubuntu-toolchain-r/test
RUN curl https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add -
RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
RUN apt-get update -y \ RUN apt-get update -y \
&& env DEBIAN_FRONTEND=noninteractive \ && env DEBIAN_FRONTEND=noninteractive \
@ -49,7 +54,8 @@ RUN apt-get update -y \
gperf \ gperf \
git \ git \
tzdata \ tzdata \
gperf gperf \
cmake
COPY build.sh / COPY build.sh /
CMD ["/bin/bash", "/build.sh"] CMD ["/bin/bash", "/build.sh"]

12
docker/packager/deb/Dockerfile
View File

@ -6,14 +6,19 @@ RUN apt-get --allow-unauthenticated update -y \
apt-get --allow-unauthenticated install --yes --no-install-recommends \ apt-get --allow-unauthenticated install --yes --no-install-recommends \
bash \ bash \
fakeroot \ fakeroot \
cmake \
ccache \ ccache \
curl \ curl \
software-properties-common software-properties-common \
gnupg \
apt-transport-https \
ca-certificates
RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main" >> /etc/apt/sources.list RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main" >> /etc/apt/sources.list
RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list
RUN add-apt-repository ppa:ubuntu-toolchain-r/test RUN add-apt-repository ppa:ubuntu-toolchain-r/test
RUN curl https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add -
RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
RUN apt-get --allow-unauthenticated update -y \ RUN apt-get --allow-unauthenticated update -y \
&& env DEBIAN_FRONTEND=noninteractive \ && env DEBIAN_FRONTEND=noninteractive \
@ -72,7 +77,8 @@ RUN apt-get --allow-unauthenticated update -y \
tzdata \ tzdata \
gperf \ gperf \
alien \ alien \
libcapnp-dev libcapnp-dev \
cmake
COPY build.sh / COPY build.sh /

2
docker/test/pvs/Dockerfile
View File

@ -20,7 +20,7 @@ RUN apt-get --allow-unauthenticated update -y \
# apt-get --allow-unauthenticated install --yes --no-install-recommends \ # apt-get --allow-unauthenticated install --yes --no-install-recommends \
# pvs-studio # pvs-studio
ENV PKG_VERSION="pvs-studio-7.03.33446.1453-amd64.deb" ENV PKG_VERSION="pvs-studio-7.04.34029.84-amd64.deb"
RUN wget -q http://files.viva64.com/beta/$PKG_VERSION RUN wget -q http://files.viva64.com/beta/$PKG_VERSION
RUN sudo dpkg -i $PKG_VERSION RUN sudo dpkg -i $PKG_VERSION