From c93ebe1e8ec0536659445800464e9953276dac77 Mon Sep 17 00:00:00 2001
From: Alvin Moore <alvinm@apple.com>
Date: Wed, 15 May 2019 10:46:52 -0700
Subject: [PATCH] Created new build docker with valgrind and default
 compilation flags

---
 build/Dockerfile          | 8 +++++---
 build/docker-compose.yaml | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index 3a0f61908a..32e7a3f2f5 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,6 +1,6 @@
 FROM centos:6
-LABEL version=0.1.3
-ENV DOCKER_IMAGEVER=0.1.3
+LABEL version=0.1.4
+ENV DOCKER_IMAGEVER=0.1.4
 
 # Install dependencies for developer tools, bindings,\
 # documentation, actorcompiler, and packaging tools\
@@ -9,7 +9,7 @@ RUN yum install -y yum-utils &&\
 	yum -y install centos-release-scl epel-release &&\
 	yum -y install devtoolset-8 java-1.8.0-openjdk-devel \
 		rh-python36-python-devel mono-core rh-ruby24 golang python27 \
-		rpm-build debbuild python-pip npm dos2unix &&\
+		rpm-build debbuild python-pip npm dos2unix valgrind &&\
 	pip install boto3==1.1.1
 
 USER root
@@ -41,4 +41,6 @@ RUN curl -L https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.2.tar.gz >
     rm -rf /tmp/libressl-2.8.2 /tmp/libressl.tar.gz
 
 ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
+ENV CC=/opt/rh/devtoolset-8/root/usr/bin/gcc
+ENV CXX=/opt/rh/devtoolset-8/root/usr/bin/g++
 CMD scl enable devtoolset-8 python27 rh-python36 rh-ruby24 -- bash
diff --git a/build/docker-compose.yaml b/build/docker-compose.yaml
index 28dea93408..a663b31770 100644
--- a/build/docker-compose.yaml
+++ b/build/docker-compose.yaml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   common: &common
-    image: foundationdb/foundationdb-build:0.1.3
+    image: foundationdb/foundationdb-build:0.1.4
 
   build-setup: &build-setup
     <<: *common