From 97e4151aff177b0161777d4f943610a2c9852b3b Mon Sep 17 00:00:00 2001 From: "Mikhail f. Shiryaev" Date: Fri, 14 Jan 2022 14:46:14 +0100 Subject: [PATCH 1/3] Remove broken editing of /etc/hosts --- docker/test/integration/runner/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile index 6a40fea7500..26adbca1b4b 100644 --- a/docker/test/integration/runner/Dockerfile +++ b/docker/test/integration/runner/Dockerfile @@ -102,8 +102,6 @@ RUN set -x \ && echo 'dockremap:165536:65536' >> /etc/subuid \ && echo 'dockremap:165536:65536' >> /etc/subgid -RUN echo '127.0.0.1 localhost test.com' >> /etc/hosts - EXPOSE 2375 ENTRYPOINT ["dockerd-entrypoint.sh"] CMD ["sh", "-c", "pytest $PYTEST_OPTS"] From 73f06421b1ab2d948f967278ce8a3981567e267b Mon Sep 17 00:00:00 2001 From: "Mikhail f. Shiryaev" Date: Fri, 14 Jan 2022 15:03:43 +0100 Subject: [PATCH 2/3] Use automatic architecture for docker repo --- docker/test/integration/runner/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile index 26adbca1b4b..22dd2e14456 100644 --- a/docker/test/integration/runner/Dockerfile +++ b/docker/test/integration/runner/Dockerfile @@ -45,7 +45,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ENV DOCKER_CHANNEL stable RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - -RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -c -s) ${DOCKER_CHANNEL}" +RUN add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -c -s) ${DOCKER_CHANNEL}" RUN apt-get update \ && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \ From fdb88b75ec1ffdfb29c1c7310e45147604f6b794 Mon Sep 17 00:00:00 2001 From: "Mikhail f. Shiryaev" Date: Fri, 14 Jan 2022 15:43:26 +0100 Subject: [PATCH 3/3] Don't build integration tests on arm64 yet --- docker/test/integration/runner/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile index 22dd2e14456..1aad2ae6770 100644 --- a/docker/test/integration/runner/Dockerfile +++ b/docker/test/integration/runner/Dockerfile @@ -58,7 +58,9 @@ RUN apt-get update \ RUN dockerd --version; docker --version -RUN python3 -m pip install \ +ARG TARGETARCH +# FIXME: psycopg2-binary is not available for aarch64, we skip it for now +RUN test x$TARGETARCH = xarm64 || ( python3 -m pip install \ PyMySQL \ aerospike==4.0.0 \ avro==1.10.2 \ @@ -88,7 +90,7 @@ RUN python3 -m pip install \ urllib3 \ requests-kerberos \ pyhdfs \ - azure-storage-blob + azure-storage-blob ) COPY modprobe.sh /usr/local/bin/modprobe COPY dockerd-entrypoint.sh /usr/local/bin/