diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 02:03:52 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 02:03:52 +0000 |
commit | a552770db60ffe9ed2bd893462a0f529ebad2b12 (patch) | |
tree | 61d841dc12f982b1afaf7956176f05df58a9d98c /extras/dockerfiles | |
parent | 57123c8a2477a4d99cb68c53d195e9fb428dd535 (diff) | |
parent | dc953bece52b53bac740d46d32c74be1a4cf1b7c (diff) | |
download | google-fruit-a552770db60ffe9ed2bd893462a0f529ebad2b12.tar.gz |
Snap for 7550930 from dc953bece52b53bac740d46d32c74be1a4cf1b7c to mainline-resolv-releaseandroid-mainline-12.0.0_r94android-mainline-12.0.0_r80android-mainline-12.0.0_r65android-mainline-12.0.0_r52android-mainline-12.0.0_r35android-mainline-12.0.0_r16android-mainline-12.0.0_r124android-mainline-12.0.0_r108android12-mainline-resolv-release
Change-Id: Ibb02121d8a0cd4de0baf2c55a698e6be568f470b
Diffstat (limited to 'extras/dockerfiles')
30 files changed, 250 insertions, 238 deletions
diff --git a/extras/dockerfiles/.dockerignore b/extras/dockerfiles/.dockerignore new file mode 100644 index 0000000..4e1954c --- /dev/null +++ b/extras/dockerfiles/.dockerignore @@ -0,0 +1,2 @@ +Dockerfile.* +rebuild_all.sh diff --git a/extras/dockerfiles/Dockerfile.ubuntu-16.04 b/extras/dockerfiles/Dockerfile.ubuntu-16.04 deleted file mode 100644 index b53b883..0000000 --- a/extras/dockerfiles/Dockerfile.ubuntu-16.04 +++ /dev/null @@ -1,9 +0,0 @@ -FROM ubuntu:16.04 -MAINTAINER Marco Poletti <poletti.marco@gmail.com> - -COPY ubuntu-16.04_custom.list /etc/apt/sources.list.d/ -COPY common_install.sh common_cleanup.sh ubuntu-16.04_install.sh / - -RUN bash -x /common_install.sh && \ - bash -x /ubuntu-16.04_install.sh && \ - bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/Dockerfile.ubuntu-17.04 b/extras/dockerfiles/Dockerfile.ubuntu-17.04 deleted file mode 100644 index ee50dcc..0000000 --- a/extras/dockerfiles/Dockerfile.ubuntu-17.04 +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:17.04 -MAINTAINER Marco Poletti <poletti.marco@gmail.com> - -COPY ubuntu-17.04_custom.list /etc/apt/sources.list.d/ -COPY common_install.sh common_cleanup.sh ubuntu-17.04_install.sh / - -RUN sed -i -re 's/([a-z]{2}\.)?archive.ubuntu.com|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list; \ - bash -x /common_install.sh && \ - bash -x /ubuntu-17.04_install.sh && \ - bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/Dockerfile.ubuntu-18.04 b/extras/dockerfiles/Dockerfile.ubuntu-18.04 index ec5d5cb..d458bb4 100644 --- a/extras/dockerfiles/Dockerfile.ubuntu-18.04 +++ b/extras/dockerfiles/Dockerfile.ubuntu-18.04 @@ -1,9 +1,53 @@ FROM ubuntu:18.04 MAINTAINER Marco Poletti <poletti.marco@gmail.com> +COPY common_install.sh common_cleanup.sh / + +RUN bash -x /common_install.sh +RUN apt-get install -y --no-install-recommends curl + +# For the Bazel repository +RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add - + +RUN echo 'deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8' >> /etc/apt/sources.list.d/bazel.list + COPY ubuntu-18.04_custom.list /etc/apt/sources.list.d/ -COPY common_install.sh common_cleanup.sh ubuntu-18.04_install.sh / -RUN bash -x /common_install.sh && \ - bash -x /ubuntu-18.04_install.sh && \ - bash -x /common_cleanup.sh +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys F23C5A6CF475977595C89F51BA6932366A755776 + +RUN apt-get update -qq + +RUN apt-get remove -y python3-pip +RUN python3 -m easy_install pip + +RUN apt-get install -y --allow-unauthenticated --no-install-recommends \ + g++-8 \ + g++-7 \ + g++-6 \ + g++-5 \ + clang-3.9 \ + clang-4.0 \ + clang-5.0 \ + clang-6.0 \ + clang-7 \ + clang-8 \ + clang-9 \ + clang-10 \ + bazel \ + git \ + python3.8 \ + clang-tidy \ + clang-format + +RUN python3.8 -m easy_install pip + +RUN pip3 install absl-py +RUN pip3 install bidict +RUN pip3 install pytest +RUN pip3 install pytest-xdist +RUN pip3 install sh +RUN pip3 install setuptools +RUN pip3 install networkx +RUN pip3 install wheel + +RUN bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/Dockerfile.ubuntu-18.10 b/extras/dockerfiles/Dockerfile.ubuntu-18.10 deleted file mode 100644 index 09bd008..0000000 --- a/extras/dockerfiles/Dockerfile.ubuntu-18.10 +++ /dev/null @@ -1,9 +0,0 @@ -FROM ubuntu:18.10 -MAINTAINER Marco Poletti <poletti.marco@gmail.com> - -COPY ubuntu-18.10_custom.list /etc/apt/sources.list.d/ -COPY common_install.sh common_cleanup.sh ubuntu-18.10_install.sh / - -RUN bash -x /common_install.sh && \ - bash -x /ubuntu-18.10_install.sh && \ - bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/Dockerfile.ubuntu-19.04 b/extras/dockerfiles/Dockerfile.ubuntu-19.04 deleted file mode 100644 index 7939990..0000000 --- a/extras/dockerfiles/Dockerfile.ubuntu-19.04 +++ /dev/null @@ -1,9 +0,0 @@ -FROM ubuntu:19.04 -MAINTAINER Marco Poletti <poletti.marco@gmail.com> - -COPY ubuntu-19.04_custom.list /etc/apt/sources.list.d/ -COPY common_install.sh common_cleanup.sh ubuntu-19.04_install.sh / - -RUN bash -x /common_install.sh && \ - bash -x /ubuntu-19.04_install.sh && \ - bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/Dockerfile.ubuntu-19.10 b/extras/dockerfiles/Dockerfile.ubuntu-19.10 new file mode 100644 index 0000000..ca6be96 --- /dev/null +++ b/extras/dockerfiles/Dockerfile.ubuntu-19.10 @@ -0,0 +1,40 @@ +FROM ubuntu:19.10 +MAINTAINER Marco Poletti <poletti.marco@gmail.com> + +COPY common_install.sh common_cleanup.sh / + +RUN bash -x /common_install.sh + +COPY ubuntu-19.10_custom.list /etc/apt/sources.list.d/ + +RUN apt-get update + +RUN apt-get install -y --allow-unauthenticated --no-install-recommends \ + g++-7 \ + g++-8 \ + g++-9 \ + clang-6.0 \ + clang-7 \ + clang-8 \ + clang-9 \ + clang-10 \ + python3-sh \ + python3-typed-ast \ + python3-pip \ + python3-setuptools \ + python3-networkx \ + clang-tidy \ + clang-format + +RUN pip3 install --upgrade pip + +RUN pip3 install absl-py +RUN pip3 install bidict +RUN pip3 install pytest +RUN pip3 install pytest-xdist +RUN pip3 install sh +RUN pip3 install setuptools +RUN pip3 install networkx +RUN pip3 install wheel + +RUN bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/Dockerfile.ubuntu-20.04 b/extras/dockerfiles/Dockerfile.ubuntu-20.04 new file mode 100644 index 0000000..3ce7d9c --- /dev/null +++ b/extras/dockerfiles/Dockerfile.ubuntu-20.04 @@ -0,0 +1,41 @@ +FROM ubuntu:20.04 +MAINTAINER Marco Poletti <poletti.marco@gmail.com> + +COPY common_install.sh common_cleanup.sh / + +RUN bash -x /common_install.sh + +COPY ubuntu-20.04_custom.list /etc/apt/sources.list.d/ + +RUN apt-get update + +RUN apt-get remove -y python3-pip +RUN python3 -m easy_install pip + +RUN apt-get install -y --allow-unauthenticated --no-install-recommends \ + g++-7 \ + g++-8 \ + g++-9 \ + g++-10 \ + clang-6.0 \ + clang-7 \ + clang-8 \ + clang-9 \ + clang-10 \ + python3.8 \ + python3.8-distutils \ + clang-tidy \ + clang-format + +RUN python3.8 -m easy_install pip + +RUN pip3 install absl-py +RUN pip3 install bidict +RUN pip3 install pytest +RUN pip3 install pytest-xdist +RUN pip3 install sh +RUN pip3 install setuptools +RUN pip3 install networkx +RUN pip3 install wheel + +RUN bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/Dockerfile.ubuntu-20.10 b/extras/dockerfiles/Dockerfile.ubuntu-20.10 new file mode 100644 index 0000000..6b4e52c --- /dev/null +++ b/extras/dockerfiles/Dockerfile.ubuntu-20.10 @@ -0,0 +1,40 @@ +FROM ubuntu:20.10 +MAINTAINER Marco Poletti <poletti.marco@gmail.com> + +COPY common_install.sh common_cleanup.sh / + +RUN bash -x /common_install.sh + +COPY ubuntu-20.10_custom.list /etc/apt/sources.list.d/ + +RUN apt-get update + +RUN apt-get remove -y python3-pip +RUN python3 -m easy_install pip + +RUN apt-get install -y --allow-unauthenticated --no-install-recommends \ + g++-7 \ + g++-8 \ + g++-9 \ + g++-10 \ + clang-8 \ + clang-9 \ + clang-10 \ + clang-11 \ + python3.8 \ + python3.8-distutils \ + clang-tidy \ + clang-format + +RUN python3.8 -m easy_install pip + +RUN pip3 install absl-py +RUN pip3 install bidict +RUN pip3 install pytest +RUN pip3 install pytest-xdist +RUN pip3 install sh +RUN pip3 install setuptools +RUN pip3 install networkx +RUN pip3 install wheel + +RUN bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/Dockerfile.ubuntu_arm-16.04 b/extras/dockerfiles/Dockerfile.ubuntu_arm-16.04 deleted file mode 100644 index 35342b9..0000000 --- a/extras/dockerfiles/Dockerfile.ubuntu_arm-16.04 +++ /dev/null @@ -1,9 +0,0 @@ -FROM multiarch/ubuntu-core:arm64-xenial -MAINTAINER Marco Poletti <poletti.marco@gmail.com> - -COPY ubuntu_arm-16.04_custom.list /etc/apt/sources.list.d/ -COPY common_install.sh common_cleanup.sh ubuntu_arm-16.04_install.sh / - -RUN bash -x /common_install.sh && \ - bash -x /ubuntu_arm-16.04_install.sh && \ - bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/Dockerfile.ubuntu_arm-18.04 b/extras/dockerfiles/Dockerfile.ubuntu_arm-18.04 index 852abb5..8ecab4d 100644 --- a/extras/dockerfiles/Dockerfile.ubuntu_arm-18.04 +++ b/extras/dockerfiles/Dockerfile.ubuntu_arm-18.04 @@ -1,9 +1,20 @@ FROM multiarch/ubuntu-core:arm64-bionic MAINTAINER Marco Poletti <poletti.marco@gmail.com> -COPY ubuntu_arm-18.04_custom.list /etc/apt/sources.list.d/ -COPY common_install.sh common_cleanup.sh ubuntu_arm-18.04_install.sh / +COPY common_install.sh common_cleanup.sh / -RUN bash -x /common_install.sh && \ - bash -x /ubuntu_arm-18.04_install.sh && \ - bash -x /common_cleanup.sh +RUN bash -x /common_install.sh +RUN apt-get install -y --allow-unauthenticated --no-install-recommends \ + g++-8 \ + g++-7 \ + g++-5 \ + clang-3.9 \ + clang-4.0 \ + clang-5.0 \ + clang-6.0 \ + python \ + python3-sh \ + python3-typed-ast \ + clang-tidy \ + clang-format +RUN bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/Dockerfile.ubuntu_arm-20.04 b/extras/dockerfiles/Dockerfile.ubuntu_arm-20.04 new file mode 100644 index 0000000..6d84554 --- /dev/null +++ b/extras/dockerfiles/Dockerfile.ubuntu_arm-20.04 @@ -0,0 +1,22 @@ +FROM multiarch/ubuntu-core:arm64-focal +MAINTAINER Marco Poletti <poletti.marco@gmail.com> + +COPY common_install.sh common_cleanup.sh / + +RUN bash -x /common_install.sh +RUN apt-get install -y --allow-unauthenticated --no-install-recommends \ + g++-7 \ + g++-8 \ + g++-9 \ + g++-10 \ + clang-6.0 \ + clang-7 \ + clang-8 \ + clang-9 \ + clang-10 \ + python \ + python3-sh \ + python3-typed-ast \ + clang-tidy \ + clang-format +RUN bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/common_install.sh b/extras/dockerfiles/common_install.sh index ba63b2c..7eff017 100644 --- a/extras/dockerfiles/common_install.sh +++ b/extras/dockerfiles/common_install.sh @@ -3,7 +3,7 @@ set -e apt-get update -qq -apt-get install -y --no-install-recommends wget gnupg +apt-get install -y --no-install-recommends wget gnupg ca-certificates apt-transport-https wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - @@ -24,15 +24,7 @@ apt-get install -y --allow-unauthenticated --no-install-recommends \ libc++-dev \ libc++abi1 \ libc++abi-dev \ - python3-pip \ - python3-setuptools \ - python3-networkx \ - dirmngr - -pip3 install --upgrade pip -python3 -m pip install absl-py -python3 -m pip install bidict -python3 -m pip install pytest -python3 -m pip install pytest-xdist -python3 -m pip install sh -python3 -m pip install wheel + dirmngr \ + python \ + python3 \ + python3-setuptools diff --git a/extras/dockerfiles/rebuild_all.sh b/extras/dockerfiles/rebuild_all.sh index 545df07..f0e23d2 100755 --- a/extras/dockerfiles/rebuild_all.sh +++ b/extras/dockerfiles/rebuild_all.sh @@ -7,15 +7,15 @@ docker run --rm --privileged multiarch/qemu-user-static:register --reset COMMANDS=() -for V in 16.04 17.04 18.04 18.10 19.04 16.04 +for V in 18.04 19.10 20.04 20.10 do - C="docker build -t polettimarco/fruit-basesystem:ubuntu-$V -f Dockerfile.ubuntu-$V ." + C="docker build --squash -t polettimarco/fruit-basesystem:ubuntu-$V -f Dockerfile.ubuntu-$V ." COMMANDS+=("$C || { echo; echo FAILED: '$C'; echo; exit 1; }") done -for V in 16.04 18.04 +for V in 18.04 20.04 do - C="docker build -t polettimarco/fruit-basesystem:ubuntu_arm-$V -f Dockerfile.ubuntu_arm-$V ." + C="docker build --squash -t polettimarco/fruit-basesystem:ubuntu_arm-$V -f Dockerfile.ubuntu_arm-$V ." COMMANDS+=("$C || { echo; echo FAILED: '$C'; echo; exit 1; }") done @@ -28,10 +28,7 @@ done | xargs -P 0 -L 1 -d '\n' bash -c || { # This way we get better diagnostics. for C in "${COMMANDS[@]}" do - $C || { - echo "Failed: $C" - exit 1 - } + bash -c "$C" || exit 1 done } diff --git a/extras/dockerfiles/ubuntu-16.04_custom.list b/extras/dockerfiles/ubuntu-16.04_custom.list deleted file mode 100644 index 54c95ff..0000000 --- a/extras/dockerfiles/ubuntu-16.04_custom.list +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main -deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial main -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.8 main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.8 main -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main -deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8 diff --git a/extras/dockerfiles/ubuntu-16.04_install.sh b/extras/dockerfiles/ubuntu-16.04_install.sh deleted file mode 100644 index 4d47e56..0000000 --- a/extras/dockerfiles/ubuntu-16.04_install.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -set -e - -apt-get install -y --no-install-recommends \ - curl - -# For the Bazel repository -curl https://bazel.build/bazel-release.pub.gpg | apt-key add - - -apt-get install -y --allow-unauthenticated --no-install-recommends \ - clang-3.5 \ - clang-3.6 \ - clang-3.7 \ - clang-3.8 \ - clang-3.9 \ - clang-4.0 \ - g++-5 \ - g++-4.9 \ - g++-6 \ - python \ - bazel \ - git \ - openjdk-8-jdk \ - clang-format - -pip3 install typed_ast diff --git a/extras/dockerfiles/ubuntu-17.04_custom.list b/extras/dockerfiles/ubuntu-17.04_custom.list deleted file mode 100644 index dfafeb4..0000000 --- a/extras/dockerfiles/ubuntu-17.04_custom.list +++ /dev/null @@ -1,8 +0,0 @@ -deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu zesty main -deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu zesty main -deb http://apt.llvm.org/zesty/ llvm-toolchain-zesty main -deb-src http://apt.llvm.org/zesty/ llvm-toolchain-zesty main -deb http://apt.llvm.org/zesty/ llvm-toolchain-zesty-3.9 main -deb-src http://apt.llvm.org/zesty/ llvm-toolchain-zesty-3.9 main -deb http://apt.llvm.org/zesty/ llvm-toolchain-zesty-4.0 main -deb-src http://apt.llvm.org/zesty/ llvm-toolchain-zesty-4.0 main diff --git a/extras/dockerfiles/ubuntu-17.04_install.sh b/extras/dockerfiles/ubuntu-17.04_install.sh deleted file mode 100644 index 6c774ef..0000000 --- a/extras/dockerfiles/ubuntu-17.04_install.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -e - -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F - -apt-get install -y --allow-unauthenticated --no-install-recommends \ - clang-3.7 \ - clang-3.8 \ - clang-3.9 \ - clang-4.0 \ - g++-5 \ - g++-4.9 \ - g++-6 \ - python \ - clang-format - -pip3 install typed_ast diff --git a/extras/dockerfiles/ubuntu-18.04_custom.list b/extras/dockerfiles/ubuntu-18.04_custom.list index e69de29..171b878 100644 --- a/extras/dockerfiles/ubuntu-18.04_custom.list +++ b/extras/dockerfiles/ubuntu-18.04_custom.list @@ -0,0 +1,17 @@ +deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main +deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic main +deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-5.0 main +deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-5.0 main +deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-6.0 main +deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-6.0 main +deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main +deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main +deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main +deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main +deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main +deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main +deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main +deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main + +deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu bionic main +deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu bionic main diff --git a/extras/dockerfiles/ubuntu-18.04_install.sh b/extras/dockerfiles/ubuntu-18.04_install.sh deleted file mode 100644 index 3d4cde7..0000000 --- a/extras/dockerfiles/ubuntu-18.04_install.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -set -e - -apt-get install -y --no-install-recommends \ - curl - -# For the Bazel repository -curl https://bazel.build/bazel-release.pub.gpg | apt-key add - - -echo 'deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8' >> /etc/apt/sources.list.d/bazel.list - -apt-get update -qq - -apt-get install -y --allow-unauthenticated --no-install-recommends \ - g++-8 \ - g++-7 \ - g++-5 \ - clang-3.9 \ - clang-4.0 \ - clang-5.0 \ - clang-6.0 \ - bazel \ - git \ - python \ - python3-sh \ - python3-typed-ast \ - clang-format diff --git a/extras/dockerfiles/ubuntu-18.10_custom.list b/extras/dockerfiles/ubuntu-18.10_custom.list deleted file mode 100644 index e69de29..0000000 --- a/extras/dockerfiles/ubuntu-18.10_custom.list +++ /dev/null diff --git a/extras/dockerfiles/ubuntu-18.10_install.sh b/extras/dockerfiles/ubuntu-18.10_install.sh deleted file mode 100644 index 1357b11..0000000 --- a/extras/dockerfiles/ubuntu-18.10_install.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -e - -apt-get install -y --allow-unauthenticated --no-install-recommends \ - g++-7 \ - g++-8 \ - g++-5 \ - clang-3.9 \ - clang-4.0 \ - clang-6.0 \ - clang-7 \ - python \ - python3-sh \ - python3-typed-ast \ - clang-format diff --git a/extras/dockerfiles/ubuntu-19.04_custom.list b/extras/dockerfiles/ubuntu-19.04_custom.list deleted file mode 100644 index e69de29..0000000 --- a/extras/dockerfiles/ubuntu-19.04_custom.list +++ /dev/null diff --git a/extras/dockerfiles/ubuntu-19.04_install.sh b/extras/dockerfiles/ubuntu-19.04_install.sh deleted file mode 100644 index 2f78bdd..0000000 --- a/extras/dockerfiles/ubuntu-19.04_install.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -e - -apt-get install -y --allow-unauthenticated --no-install-recommends \ - g++-7 \ - g++-8 \ - g++-9 \ - clang-6.0 \ - clang-7 \ - clang-8 \ - python \ - python3-sh \ - python3-typed-ast \ - clang-format diff --git a/extras/dockerfiles/ubuntu-19.10_custom.list b/extras/dockerfiles/ubuntu-19.10_custom.list new file mode 100644 index 0000000..ac1b4bd --- /dev/null +++ b/extras/dockerfiles/ubuntu-19.10_custom.list @@ -0,0 +1,6 @@ +deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan main +deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan main +deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan-9 main +deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan-9 main +deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan-10 main +deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan-10 main diff --git a/extras/dockerfiles/ubuntu-20.04_custom.list b/extras/dockerfiles/ubuntu-20.04_custom.list new file mode 100644 index 0000000..c26e2d9 --- /dev/null +++ b/extras/dockerfiles/ubuntu-20.04_custom.list @@ -0,0 +1,4 @@ +deb http://apt.llvm.org/focal/ llvm-toolchain-focal-9 main +deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-9 main +deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main +deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main diff --git a/extras/dockerfiles/ubuntu-20.10_custom.list b/extras/dockerfiles/ubuntu-20.10_custom.list new file mode 100644 index 0000000..c26e2d9 --- /dev/null +++ b/extras/dockerfiles/ubuntu-20.10_custom.list @@ -0,0 +1,4 @@ +deb http://apt.llvm.org/focal/ llvm-toolchain-focal-9 main +deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-9 main +deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main +deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main diff --git a/extras/dockerfiles/ubuntu_arm-16.04_install.sh b/extras/dockerfiles/ubuntu_arm-16.04_install.sh deleted file mode 100644 index 504b2c0..0000000 --- a/extras/dockerfiles/ubuntu_arm-16.04_install.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -e - -apt-get install -y --allow-unauthenticated --no-install-recommends \ - clang-3.5 \ - clang-3.6 \ - clang-3.7 \ - clang-3.9 \ - clang-4.0 \ - g++-5 \ - g++-4.9 \ - g++-6 \ - python \ - clang-format diff --git a/extras/dockerfiles/ubuntu_arm-18.04_custom.list b/extras/dockerfiles/ubuntu_arm-18.04_custom.list deleted file mode 100644 index e347ae1..0000000 --- a/extras/dockerfiles/ubuntu_arm-18.04_custom.list +++ /dev/null @@ -1,8 +0,0 @@ -#deb [trusted=yes] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu bionic main -#deb-src [trusted=yes] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu bionic main -#deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic main -#deb-src [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic main -#deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-4.0 main -#deb-src [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-4.0 main -#deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-5.0 main -#deb-src [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-5.0 main diff --git a/extras/dockerfiles/ubuntu_arm-18.04_install.sh b/extras/dockerfiles/ubuntu_arm-18.04_install.sh deleted file mode 100644 index 8e21982..0000000 --- a/extras/dockerfiles/ubuntu_arm-18.04_install.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -e - -apt-get install -y --allow-unauthenticated --no-install-recommends \ - g++-8 \ - g++-7 \ - g++-5 \ - clang-3.9 \ - clang-4.0 \ - clang-5.0 \ - clang-6.0 \ - python \ - python3-sh \ - python3-typed-ast \ - clang-format |