Commit 5292da07 authored by Jean Bez's avatar Jean Bez
Browse files

make sure we are using the latest image

parent dd69375a

docker/build_env.docker

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ RUN yum -y -q update && yum -y -q install \ 
	gcc \

	gcc-c++ \

	openssl-devel \

	libconfig-devel \

	# Mercury dependencies

	libtool \

	libtool-ltdl-devel \
@@ -34,6 +35,7 @@ RUN yum -y -q update && yum -y -q install \ 
	snappy-devel \

	libzstd-devel \

	lz4-devel \

	bzip2 \

	bzip2-devel \

	# ada-fs requires C++ 14

	devtoolset-8-gcc \
@@ -78,9 +80,11 @@ RUN yum -y -q update && yum -y -q install \ 
	automake \

	cmake \

	cmake3 \

	sudo \

	gcc \

	gcc-c++ \

	openssl-devel \

	libconfig-devel \

	# Mercury dependencies

	libtool \

	libtool-ltdl-devel \
@@ -90,6 +94,7 @@ RUN yum -y -q update && yum -y -q install \ 
	snappy-devel \

	libzstd-devel \

	lz4-devel \

	bzip2 \

	bzip2-devel \

	# ada-fs requires C++ 14

	devtoolset-8-gcc \

docker/debian_build_env.docker

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ 
		cmake \

		gcc \

		g++ \

		# AGIOS dependencies

		libconfig-dev \

		# Mercury dependencies

		libltdl-dev \

		lbzip2 \

scripts/compile_dep.sh

+0 −2
Original line number Diff line number Diff line
@@ -218,8 +218,6 @@ echo "############################################################ Installing: 
CURR=${SOURCE}/agios

prepare_build_dir ${CURR}

cd ${CURR}

sed -i 's/\/usr\/lib\/x86_64-linux-gnu\/libconfig.so/\/usr\/lib64\/libconfig.so/g' Makefile

sed -i 's/sudo//g' Makefile

make clean

make library