Unverified Commit 8b6d9465 authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

Docker: update devtoolset v7 -> v8

parent eb706bf2

docker/build_env.docker

+6 −6
Original line number Original line Diff line number Diff line
@@ -36,14 +36,14 @@ RUN yum -y -q update && yum -y -q install \ 
	lz4-devel \

	lz4-devel \

	bzip2-devel \

	bzip2-devel \

	# ada-fs requires C++ 14

	# ada-fs requires C++ 14

	devtoolset-7-gcc \

	devtoolset-8-gcc \

	devtoolset-7-gcc-c++ \

	devtoolset-8-gcc-c++ \

	libuuid-devel \

	libuuid-devel \

&& yum -y -q clean all

&& yum -y -q clean all





# Enable gcc/g++ 7.x

# Enable gcc/g++ 8.x

ENV	CC		"/opt/rh/devtoolset-7/root/usr/bin/gcc"

ENV	CC		"/opt/rh/devtoolset-8/root/usr/bin/gcc"

ENV	CXX		"/opt/rh/devtoolset-7/root/usr/bin/g++"

ENV	CXX		"/opt/rh/devtoolset-8/root/usr/bin/g++"





# Download dependencies source

# Download dependencies source

COPY scripts/dl_dep.sh		$SCRIPTS_PATH/

COPY scripts/dl_dep.sh		$SCRIPTS_PATH/
@@ -95,7 +95,7 @@ RUN yum -y -q update && yum -y -q install \ 
&& yum -y -q clean all

&& yum -y -q clean all









# Enable gcc/g++ 7.x

# Enable gcc/g++ 8.x

ENV	CC		"/opt/rh/devtoolset-8/root/usr/bin/gcc"

ENV	CC		"/opt/rh/devtoolset-8/root/usr/bin/gcc"

ENV	CXX		"/opt/rh/devtoolset-8/root/usr/bin/g++"

ENV	CXX		"/opt/rh/devtoolset-8/root/usr/bin/g++"