[IDEA][WIP] Fix location of build scripts, define project meta-vars.

Author: aizatsky-at-google

expat/Dockerfile

@@ -18,4 +18,7 @@ FROM ossfuzz/base-libfuzzer
 MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get install -y make autoconf automake libtool docbook2x
 
-CMD /src/oss-fuzz/expat/build.sh
+ENV GIT_CHECKOUT_DIR="expat"
+ENV GIT_URL="git://git.code.sf.net/p/expat/code_git"
+
+COPY build.sh /src/

infra/base-images/base-libfuzzer/Dockerfile

@@ -16,7 +16,7 @@
 
 FROM ossfuzz/base-clang
 MAINTAINER mike.aizatsky@gmail.com
-RUN apt-get install -y git libc6-dev
+RUN apt-get install -y git libc6-dev 
 
 RUN cd /src && git clone --depth 1 https://github.com/google/oss-fuzz.git
 VOLUME /src/oss-fuzz
@@ -33,5 +33,7 @@ ENV LDFLAGS "-Wl,-whole-archive /usr/local/lib/libc++.a /usr/local/lib/libc++abi
 RUN mkdir /out
 VOLUME /out
 
-COPY run /
-ENTRYPOINT ["/run"]
+RUN mkdir /src/bin
+COPY compile checkout /src/bin/
+ENV PATH=/src/bin:$PATH
+CMD ["compile"]

infra/base-images/base-libfuzzer/README.md

@@ -0,0 +1,13 @@
+# base-libfuzzer
+================
+
+*Abstract* base image for all libfuzzer builders.
+
+Supported commands:
+
+* `docker run -ti <image_name> [compile]` - compiles everything. Expects /src/ paths
+  to be mounted.
+* `docker run -ti <image_name> checkout` - checks sources out automatically 
+  and compiles them.
+* `docker run -ti <image_name> /bin/bash` - drop into shell. Run `compile` script
+  to start build. 

infra/base-images/base-libfuzzer/checkout

@@ -0,0 +1,26 @@
+#!/bin/bash -eux
+# Copyright 2016 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.
+#
+################################################################################
+
+cd /src
+
+if [ -n "$GIT_CHECKOUT_DIR" ] ; then
+  git clone $GIT_URL $GIT_CHECKOUT_DIR
+else
+  git clone $GIT_URL
+fi
+
+compile

infra/base-images/base-libfuzzer/run renamed to infra/base-images/base-libfuzzer/compile

@@ -36,4 +36,4 @@ echo "LDFLAGS=$LDFLAGS"
 
 echo "---------------------------------------------------------------"
 
-$*
+/src/build.sh