mirror of https://github.com/ByConity/ByConity
Remove zookeeper from CI images
This commit is contained in:
parent
7e6536097f
commit
a85bb16c66
|
@ -21,9 +21,7 @@ RUN apt-get update -y \
|
||||||
telnet \
|
telnet \
|
||||||
tree \
|
tree \
|
||||||
unixodbc \
|
unixodbc \
|
||||||
wget \
|
wget
|
||||||
zookeeper \
|
|
||||||
zookeeperd
|
|
||||||
|
|
||||||
RUN mkdir -p /tmp/clickhouse-odbc-tmp \
|
RUN mkdir -p /tmp/clickhouse-odbc-tmp \
|
||||||
&& wget -nv -O - ${odbc_driver_url} | tar --strip-components=1 -xz -C /tmp/clickhouse-odbc-tmp \
|
&& wget -nv -O - ${odbc_driver_url} | tar --strip-components=1 -xz -C /tmp/clickhouse-odbc-tmp \
|
||||||
|
|
|
@ -48,8 +48,6 @@ fi
|
||||||
|
|
||||||
ln -sf /usr/share/clickhouse-test/config/client_config.xml /etc/clickhouse-client/config.xml
|
ln -sf /usr/share/clickhouse-test/config/client_config.xml /etc/clickhouse-client/config.xml
|
||||||
|
|
||||||
service zookeeper start
|
|
||||||
sleep 5
|
|
||||||
service clickhouse-server start && sleep 5
|
service clickhouse-server start && sleep 5
|
||||||
|
|
||||||
if cat /usr/bin/clickhouse-test | grep -q -- "--use-skip-list"; then
|
if cat /usr/bin/clickhouse-test | grep -q -- "--use-skip-list"; then
|
||||||
|
|
|
@ -67,8 +67,6 @@ RUN apt-get --allow-unauthenticated update -y \
|
||||||
unixodbc-dev \
|
unixodbc-dev \
|
||||||
wget \
|
wget \
|
||||||
zlib1g-dev \
|
zlib1g-dev \
|
||||||
zookeeper \
|
|
||||||
zookeeperd
|
|
||||||
|
|
||||||
RUN mkdir -p /tmp/clickhouse-odbc-tmp \
|
RUN mkdir -p /tmp/clickhouse-odbc-tmp \
|
||||||
&& wget -nv -O - ${odbc_driver_url} | tar --strip-components=1 -xz -C /tmp/clickhouse-odbc-tmp \
|
&& wget -nv -O - ${odbc_driver_url} | tar --strip-components=1 -xz -C /tmp/clickhouse-odbc-tmp \
|
||||||
|
|
|
@ -48,8 +48,6 @@ fi
|
||||||
|
|
||||||
ln -sf /usr/share/clickhouse-test/config/client_config.xml /etc/clickhouse-client/config.xml
|
ln -sf /usr/share/clickhouse-test/config/client_config.xml /etc/clickhouse-client/config.xml
|
||||||
|
|
||||||
service zookeeper start
|
|
||||||
sleep 5
|
|
||||||
service clickhouse-server start && sleep 5
|
service clickhouse-server start && sleep 5
|
||||||
|
|
||||||
if cat /usr/bin/clickhouse-test | grep -q -- "--use-skip-list"; then
|
if cat /usr/bin/clickhouse-test | grep -q -- "--use-skip-list"; then
|
||||||
|
|
|
@ -11,8 +11,6 @@ RUN apt-get update -y \
|
||||||
tzdata \
|
tzdata \
|
||||||
fakeroot \
|
fakeroot \
|
||||||
debhelper \
|
debhelper \
|
||||||
zookeeper \
|
|
||||||
zookeeperd \
|
|
||||||
expect \
|
expect \
|
||||||
python \
|
python \
|
||||||
python-lxml \
|
python-lxml \
|
||||||
|
|
|
@ -72,9 +72,6 @@ ln -sf /usr/share/clickhouse-test/config/client_config.xml /etc/clickhouse-clien
|
||||||
ln -s --backup=simple --suffix=_original.xml \
|
ln -s --backup=simple --suffix=_original.xml \
|
||||||
/usr/share/clickhouse-test/config/query_masking_rules.xml /etc/clickhouse-server/config.d/
|
/usr/share/clickhouse-test/config/query_masking_rules.xml /etc/clickhouse-server/config.d/
|
||||||
|
|
||||||
service zookeeper start
|
|
||||||
sleep 5
|
|
||||||
|
|
||||||
start_clickhouse
|
start_clickhouse
|
||||||
|
|
||||||
sleep 10
|
sleep 10
|
||||||
|
|
Loading…
Reference in New Issue