[infra] Install deps in base-image, and separate out base-msan-builder.

23 files changed, 62 insertions, 15 deletions

diff --git a/infra/base-images/base-clang/Dockerfile b/infra/base-images/base-clang/Dockerfile
index 8e1bc81f..94f99b1d 100644
--- a/infra/base-images/base-clang/Dockerfile
+++ b/infra/base-images/base-clang/Dockerfile
@@ -19,8 +19,6 @@
 FROM gcr.io/oss-fuzz-base/base-image
 MAINTAINER mike.aizatsky@gmail.com
 
-RUN apt-get install -y libc6-dev binutils libgcc-5-dev
-
 COPY checkout_build_install_llvm.sh /root/
 # Keep all steps in the same script to decrease the number of intermediate
 # layes in docker file.
diff --git a/infra/base-images/base-image/Dockerfile b/infra/base-images/base-image/Dockerfile
index 3f6de1af..17344d9e 100644
--- a/infra/base-images/base-image/Dockerfile
+++ b/infra/base-images/base-image/Dockerfile
@@ -19,7 +19,10 @@
 FROM ubuntu:16.04
 MAINTAINER mike.aizatsky@gmail.com
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y libc6-dev binutils libgcc-5-dev && \
+    apt-get autoremove -y
 
 ENV OUT=/out
 ENV SRC=/src
diff --git a/infra/base-images/base-msan-builder/Dockerfile b/infra/base-images/base-msan-builder/Dockerfile
new file mode 100644
index 00000000..e6117577
--- /dev/null
+++ b/infra/base-images/base-msan-builder/Dockerfile
@@ -0,0 +1,29 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+FROM gcr.io/oss-fuzz-base/base-clang
+MAINTAINER ochang@google.com
+RUN sed -i -r 's/#\s*deb-src/deb-src/g' /etc/apt/sources.list
+RUN apt-get update && apt-get install -y python dpkg-dev patchelf python-apt zip
+
+# Take all libraries from lib/msan
+RUN cp -R /usr/msan/lib/* /usr/lib/
+
+COPY compiler_wrapper.py msan_build.py patch_build.py wrapper_utils.py /usr/local/bin/
+COPY packages /usr/local/bin/packages
+
+RUN mkdir /msan
+WORKDIR /msan
diff --git a/infra/base-images/msan-builder/compiler_wrapper.py b/infra/base-images/base-msan-builder/compiler_wrapper.py
index b93234dc..b93234dc 100755
--- a/infra/base-images/msan-builder/compiler_wrapper.py
+++ b/infra/base-images/base-msan-builder/compiler_wrapper.py
diff --git a/infra/base-images/msan-builder/compiler_wrapper_test.py b/infra/base-images/base-msan-builder/compiler_wrapper_test.py
index a05592d3..a05592d3 100644
--- a/infra/base-images/msan-builder/compiler_wrapper_test.py
+++ b/infra/base-images/base-msan-builder/compiler_wrapper_test.py
diff --git a/infra/base-images/msan-builder/msan_build.py b/infra/base-images/base-msan-builder/msan_build.py
index 928b1a59..928b1a59 100755
--- a/infra/base-images/msan-builder/msan_build.py
+++ b/infra/base-images/base-msan-builder/msan_build.py
diff --git a/infra/base-images/msan-builder/packages/__init__.py b/infra/base-images/base-msan-builder/packages/__init__.py
index e69de29b..e69de29b 100644
--- a/infra/base-images/msan-builder/packages/__init__.py
+++ b/infra/base-images/base-msan-builder/packages/__init__.py
diff --git a/infra/base-images/msan-builder/packages/boost1_58.py b/infra/base-images/base-msan-builder/packages/boost1_58.py
index 8071b7ec..8071b7ec 100644
--- a/infra/base-images/msan-builder/packages/boost1_58.py
+++ b/infra/base-images/base-msan-builder/packages/boost1_58.py
diff --git a/infra/base-images/msan-builder/packages/gnutls28.py b/infra/base-images/base-msan-builder/packages/gnutls28.py
index f8407a66..f8407a66 100644
--- a/infra/base-images/msan-builder/packages/gnutls28.py
+++ b/infra/base-images/base-msan-builder/packages/gnutls28.py
diff --git a/infra/base-images/msan-builder/packages/libgcrypt20.py b/infra/base-images/base-msan-builder/packages/libgcrypt20.py
index 9d200af6..9d200af6 100644
--- a/infra/base-images/msan-builder/packages/libgcrypt20.py
+++ b/infra/base-images/base-msan-builder/packages/libgcrypt20.py
diff --git a/infra/base-images/base-msan-builder/packages/mesa.py b/infra/base-images/base-msan-builder/packages/mesa.py
new file mode 100644
index 00000000..ec2e9d21
--- /dev/null
+++ b/infra/base-images/base-msan-builder/packages/mesa.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+import package
+
+
+class Package(package.Package):
+  """mesa package."""
+
+  def __init__(self, apt_version):
+    super(Package, self).__init__('mesa', apt_version)
+
+  def PreBuild(self, source_directory, env, custom_bin_dir):
+    env['DEB_CXXFLAGS_APPEND'] += ' -std=c++11'
diff --git a/infra/base-images/msan-builder/packages/nettle.py b/infra/base-images/base-msan-builder/packages/nettle.py
index e1b0e2f8..e1b0e2f8 100644
--- a/infra/base-images/msan-builder/packages/nettle.py
+++ b/infra/base-images/base-msan-builder/packages/nettle.py
diff --git a/infra/base-images/msan-builder/packages/openssl.py b/infra/base-images/base-msan-builder/packages/openssl.py
index e24ccc58..e24ccc58 100644
--- a/infra/base-images/msan-builder/packages/openssl.py
+++ b/infra/base-images/base-msan-builder/packages/openssl.py
diff --git a/infra/base-images/msan-builder/packages/package.py b/infra/base-images/base-msan-builder/packages/package.py
index 938c2a44..938c2a44 100644
--- a/infra/base-images/msan-builder/packages/package.py
+++ b/infra/base-images/base-msan-builder/packages/package.py
diff --git a/infra/base-images/msan-builder/packages/pixman.py b/infra/base-images/base-msan-builder/packages/pixman.py
index a7cdaa7e..a7cdaa7e 100644
--- a/infra/base-images/msan-builder/packages/pixman.py
+++ b/infra/base-images/base-msan-builder/packages/pixman.py
diff --git a/infra/base-images/msan-builder/packages/pulseaudio.py b/infra/base-images/base-msan-builder/packages/pulseaudio.py
index 853b9e72..853b9e72 100644
--- a/infra/base-images/msan-builder/packages/pulseaudio.py
+++ b/infra/base-images/base-msan-builder/packages/pulseaudio.py
diff --git a/infra/base-images/msan-builder/packages/pulseaudio_fix_android.patch b/infra/base-images/base-msan-builder/packages/pulseaudio_fix_android.patch
index e86f7982..e86f7982 100644
--- a/infra/base-images/msan-builder/packages/pulseaudio_fix_android.patch
+++ b/infra/base-images/base-msan-builder/packages/pulseaudio_fix_android.patch
diff --git a/infra/base-images/msan-builder/packages/sqlite3.py b/infra/base-images/base-msan-builder/packages/sqlite3.py
index 3e1a1070..3e1a1070 100644
--- a/infra/base-images/msan-builder/packages/sqlite3.py
+++ b/infra/base-images/base-msan-builder/packages/sqlite3.py
diff --git a/infra/base-images/msan-builder/packages/systemd.py b/infra/base-images/base-msan-builder/packages/systemd.py
index 5cb6d60b..5cb6d60b 100644
--- a/infra/base-images/msan-builder/packages/systemd.py
+++ b/infra/base-images/base-msan-builder/packages/systemd.py
diff --git a/infra/base-images/msan-builder/packages/tar.py b/infra/base-images/base-msan-builder/packages/tar.py
index 74abd5c7..74abd5c7 100644
--- a/infra/base-images/msan-builder/packages/tar.py
+++ b/infra/base-images/base-msan-builder/packages/tar.py
diff --git a/infra/base-images/msan-builder/patch_build.py b/infra/base-images/base-msan-builder/patch_build.py
index b6f6e000..b6f6e000 100755
--- a/infra/base-images/msan-builder/patch_build.py
+++ b/infra/base-images/base-msan-builder/patch_build.py
diff --git a/infra/base-images/msan-builder/wrapper_utils.py b/infra/base-images/base-msan-builder/wrapper_utils.py
index 0cbf1677..0cbf1677 100644
--- a/infra/base-images/msan-builder/wrapper_utils.py
+++ b/infra/base-images/base-msan-builder/wrapper_utils.py
diff --git a/infra/base-images/msan-builder/Dockerfile b/infra/base-images/msan-builder/Dockerfile
index 5af28af3..4fe7eaa0 100644
--- a/infra/base-images/msan-builder/Dockerfile
+++ b/infra/base-images/msan-builder/Dockerfile
@@ -14,19 +14,8 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-clang
+FROM gcr.io/oss-fuzz-base/base-msan-builder
 MAINTAINER ochang@google.com
-RUN sed -i -r 's/#\s*deb-src/deb-src/g' /etc/apt/sources.list
-RUN apt-get update && apt-get install -y python dpkg-dev patchelf python-apt zip
-
-# Take all libraries from lib/msan
-RUN cp -R /usr/msan/lib/* /usr/lib/
-
-COPY compiler_wrapper.py msan_build.py patch_build.py wrapper_utils.py /usr/local/bin/
-COPY packages /usr/local/bin/packages
-
-RUN mkdir /msan
-WORKDIR /msan
 ENV PYTHONUNBUFFERED 1
 RUN msan_build.py --work-dir=$WORK \
     libarchive13 \