From dad401a047722fdef41d688db0aaa54936e05be0 Mon Sep 17 00:00:00 2001 From: alesapin Date: Fri, 27 Sep 2019 16:25:51 +0300 Subject: [PATCH] Downgrade cmake version in packager image --- docker/packager/binary/Dockerfile | 5 +---- docker/packager/deb/Dockerfile | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile index 2ad696cd279..d88a2767efd 100644 --- a/docker/packager/binary/Dockerfile +++ b/docker/packager/binary/Dockerfile @@ -16,9 +16,6 @@ RUN apt-get --allow-unauthenticated update -y \ 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 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 \ && env DEBIAN_FRONTEND=noninteractive \ @@ -59,7 +56,7 @@ RUN apt-get update -y \ gdb \ rename \ wget - + # Build and install tools for cross-linking to Darwin ENV CC=clang-8 diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile index 10263205fb4..986768b7a95 100644 --- a/docker/packager/deb/Dockerfile +++ b/docker/packager/deb/Dockerfile @@ -17,8 +17,6 @@ RUN apt-get --allow-unauthenticated update -y \ 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 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 \ && env DEBIAN_FRONTEND=noninteractive \