Revert changes

This commit is contained in:
alesapin 2020-09-14 15:24:38 +03:00
parent fb7fc28e6f
commit 393c213866
3 changed files with 8 additions and 39 deletions

View File

@ -24,9 +24,16 @@ RUN apt-get update \
software-properties-common \
--yes --no-install-recommends
# Special dpkg-deb (https://github.com/ClickHouse-Extras/dpkg) version which is able
# to compress files using pigz (https://zlib.net/pigz/) instead of gzip.
# Significantly increase deb packaging speed and compatible with old systems
RUN curl -O https://clickhouse-builds.s3.yandex.net/utils/1/dpkg-deb \
&& chmod +x dpkg-deb \
&& cp dpkg-deb /usr/bin
ENV APACHE_PUBKEY_HASH="bba6987b63c63f710fd4ed476121c588bc3812e99659d27a855f8c4d312783ee66ad6adfce238765691b04d62fa3688f"
RUN export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
RUN export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
&& wget -nv -O /tmp/arrow-keyring.deb "https://apache.bintray.com/arrow/ubuntu/apache-arrow-archive-keyring-latest-${CODENAME}.deb" \
&& echo "${APACHE_PUBKEY_HASH} /tmp/arrow-keyring.deb" | sha384sum -c \
&& dpkg -i /tmp/arrow-keyring.deb

View File

@ -2,25 +2,6 @@
set -x -e
# Special dpkg-deb (https://github.com/ClickHouse-Extras/dpkg) version which is able
# to compress files using pigz (https://zlib.net/pigz/) instead of gzip.
# Significantly increase deb packaging speed and compatible with old systems
counter=0
until curl -O https://clickhouse-builds.s3.yandex.net/utils/1/dpkg-deb
do
sleep 0.5
counter=$(($counter + 1))
echo "Cannot fetch better dpgk, retry $counter"
if [ "$counter" -gt 120 ]
then
echo "Cannot fetch busybox image all retries exceeded"
exit 1
fi
done
chmod +x dpkg-deb && cp dpkg-deb /usr/bin
ccache --show-stats ||:
ccache --zero-stats ||:
build/release --no-pbuilder $ALIEN_PKGS | ts '%Y-%m-%d %H:%M:%S'

View File

@ -2,25 +2,6 @@
set -x -e
# Special dpkg-deb (https://github.com/ClickHouse-Extras/dpkg) version which is able
# to compress files using pigz (https://zlib.net/pigz/) instead of gzip.
# Significantly increase deb packaging speed and compatible with old systems
counter=0
until curl -O https://clickhouse-builds.s3.yandex.net/utils/1/dpkg-deb
do
sleep 0.5
counter=$(($counter + 1))
echo "Cannot fetch better dpgk, retry $counter"
if [ "$counter" -gt 120 ]
then
echo "Cannot fetch busybox image all retries exceeded"
exit 1
fi
done
chmod +x dpkg-deb && cp dpkg-deb /usr/bin
ccache --show-stats ||:
ccache --zero-stats ||:
build/release --no-pbuilder $ALIEN_PKGS | ts '%Y-%m-%d %H:%M:%S'