Merge pull request #22055 from ClickHouse/aku/llvm-cloudflare-master

akuzm · web-flow · commit a8b7377e9dec · 2021-03-24T01:20:44.000+03:00
quick fix for broken resolution of apt.llvm.org on Yandex infra
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
@@ -4,14 +4,26 @@ FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
 
 RUN apt-get update \
-    && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
+    && apt-get install \
+        apt-transport-https \
+        apt-utils \
+        ca-certificates \
+        dnsutils \
+        gnupg \
+        iputils-ping \
+        lsb-release \
+        wget \
         --yes --no-install-recommends --verbose-versions \
+    && cat /etc/resolv.conf \
+    && echo "nameserver 1.1.1.1" >> /etc/resolv.conf \
+    && nslookup -debug apt.llvm.org \
+    && ping -c1 apt.llvm.org \
+    && wget -nv --retry-connrefused --tries=10 -O /tmp/llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key \
     && export LLVM_PUBKEY_HASH="bda960a8da687a275a2078d43c111d66b1c6a893a3275271beedf266c1ff4a0cdecb429c7a5cccf9f486ea7aa43fd27f" \
-    && wget -nv -O /tmp/llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key \
     && echo "${LLVM_PUBKEY_HASH} /tmp/llvm-snapshot.gpg.key" | sha384sum -c \
     && apt-key add /tmp/llvm-snapshot.gpg.key \
     && export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
-    && echo "deb [trusted=yes] http://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-${LLVM_VERSION} main" >> \
+    && echo "deb [trusted=yes] https://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-${LLVM_VERSION} main" >> \
         /etc/apt/sources.list
 
 # initial packages
@@ -24,7 +36,10 @@ RUN apt-get update \
         software-properties-common \
         --yes --no-install-recommends
 
-RUN apt-get update \
+RUN cat /etc/resolv.conf \
+    && echo "nameserver 1.1.1.1" >> /etc/resolv.conf \
+    && nslookup -debug apt.llvm.org \
+    && apt-get update \
     && apt-get install \
         bash \
         cmake \
diff --git a/docker/test/base/Dockerfile b/docker/test/base/Dockerfile
@@ -4,8 +4,9 @@ FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
 
 RUN apt-get update \
-    && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
+    && apt-get install apt-utils ca-certificates lsb-release wget gnupg apt-transport-https \
         --yes --no-install-recommends --verbose-versions \
+    && echo "nameserver 1.1.1.1" >> /etc/resolv.conf \
     && export LLVM_PUBKEY_HASH="bda960a8da687a275a2078d43c111d66b1c6a893a3275271beedf266c1ff4a0cdecb429c7a5cccf9f486ea7aa43fd27f" \
     && wget -nv -O /tmp/llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key \
     && echo "${LLVM_PUBKEY_HASH} /tmp/llvm-snapshot.gpg.key" | sha384sum -c \
@@ -31,7 +32,8 @@ RUN curl -O https://clickhouse-builds.s3.yandex.net/utils/1/dpkg-deb \
     && chmod +x dpkg-deb \
     && cp dpkg-deb /usr/bin
 
-RUN apt-get update \
+RUN echo "nameserver 1.1.1.1" >> /etc/resolv.conf \
+    && apt-get update \
     && apt-get install \
         clang-${LLVM_VERSION} \
         debhelper \
