Merge waymo-research#247

Author: peisun1115

pip_pkg_scripts/build.Dockerfile

@@ -1,36 +1,31 @@
 FROM tensorflow/tensorflow:custom-op-ubuntu16
 
-ENV GITHUB_BRANCH="master"
 ENV PYTHON_VERSION="3"
 ENV PYTHON_MINOR_VERSION=""
 ENV PIP_MANYLINUX2010="1"
 ENV TF_VERSION="1.15.0"
-
 RUN wget https://github.com/bazelbuild/bazel/releases/download/3.1.0/bazel-3.1.0-installer-linux-x86_64.sh > /dev/null
 RUN bash bazel-3.1.0-installer-linux-x86_64.sh
-
 # There are some problems with the python3 installation from custom-op-ubuntu16.
 # Remove it and install new ones.
 RUN apt-get remove --purge -y python3.5 python3.6
 RUN rm -f /etc/apt/sources.list.d/jonathonf-ubuntu-python-3_6-xenial.list
 RUN apt-key del F06FC659
-
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA6932366A755776
 RUN echo "deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu xenial main" > /etc/apt/sources.list.d/deadsnakes-ppa-xenial.list
 RUN apt-get update && apt-get install -y python3.5 python3.6 python3.7 python3.8 python3.8-distutils
 RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-
 RUN for python in python3.5 python3.6 python3.7 python3.8; do \
       $python get-pip.py && \
       $python -m pip install --upgrade pip setuptools auditwheel && \
       $python -m pip install --upgrade grpcio>=1.24.3; \
     done
 
-COPY pip_pkg_scripts/build.sh /
-
-VOLUME /tmp/pip_pkg_build
+VOLUME /tmp/artifacts
+COPY . /tmp/repo
+WORKDIR /tmp/repo
 
-ENTRYPOINT ["/build.sh"]
+ENTRYPOINT ["pip_pkg_scripts/build.sh"]
 
 # The default parameters for the build.sh
 CMD []

pip_pkg_scripts/build.sh

@@ -46,22 +46,17 @@ ${PIP} install tensorflow-gpu=="${TF_VERSION}" --user
 # bazel.
 python3 -m pip install --upgrade tensorflow-gpu=="${TF_VERSION}" --user
 
-rm -rf waymo-od || true
-git clone https://github.com/waymo-research/waymo-open-dataset.git waymo-od
-cd waymo-od
-
-git checkout remotes/origin/${GITHUB_BRANCH}
-
 ./configure.sh
 
 bazel clean
 bazel build ...
 bazel test ...
 
-DST_DIR="/tmp/pip_pkg_build"
+DST_DIR="/tmp/artifacts"
 rm -rf "$DST_DIR" || true
 ./pip_pkg_scripts/build_pip_pkg.sh "$DST_DIR" ${PYTHON_VERSION}
 # Comment the following line if you run this outside of the container.
 if [[ "${PIP_MANYLINUX2010}" == "1" ]]; then
   find "$DST_DIR" -name *.whl | xargs ./third_party/auditwheel.sh repair --plat manylinux2010_x86_64 -w "$DST_DIR"
 fi
+