update(docker/builder): add llvm-toolset-7

Co-authored-by: Lorenzo Fontana <lo@linux.com>
Signed-off-by: Leonardo Di Donato <leodidonato@gmail.com>
This commit is contained in:
Leonardo Di Donato 2019-12-13 11:30:41 +01:00 committed by Leo Di Donato
parent cd1b23d2bc
commit ac4f089903
2 changed files with 3 additions and 3 deletions

View File

@ -22,11 +22,11 @@ ARG DOCKER_VERSION=1.11.0
ARG CMAKE_VERSION=3.5.0 ARG CMAKE_VERSION=3.5.0
RUN yum -y install centos-release-scl && \ RUN yum -y install centos-release-scl && \
INSTALL_PKGS="devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-toolchain devtoolset-7-libstdc++-devel devtoolset-7-elfutils-libelf-devel glibc-static autoconf automake libtool createrepo expect git which libcurl-devel zlib-devel rpm-build" && \ INSTALL_PKGS="devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-toolchain devtoolset-7-libstdc++-devel devtoolset-7-elfutils-libelf-devel llvm-toolset-7 glibc-static autoconf automake libtool createrepo expect git which libcurl-devel zlib-devel rpm-build" && \
yum -y install --setopt=tsflags=nodocs $INSTALL_PKGS && \ yum -y install --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS rpm -V $INSTALL_PKGS
RUN source scl_source enable devtoolset-7 && \ RUN source scl_source enable devtoolset-7 llvm-toolset-7 && \
cd /tmp && \ cd /tmp && \
curl -L https://github.com/kitware/cmake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz | tar xz; \ curl -L https://github.com/kitware/cmake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz | tar xz; \
cd cmake-${CMAKE_VERSION} && \ cd cmake-${CMAKE_VERSION} && \

View File

@ -3,4 +3,4 @@
# #
# This will make scl collection binaries work out of box. # This will make scl collection binaries work out of box.
unset BASH_ENV PROMPT_COMMAND ENV unset BASH_ENV PROMPT_COMMAND ENV
source scl_source enable devtoolset-7 source scl_source enable devtoolset-7 llvm-toolset-7