HBASE-15724 Use explicit docker image Summary: Set the tag for cpp docker image Don't set the env on command line
Test Plan: Build it. Differential Revision: https://reviews.facebook.net/D57315 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a1069eb1 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a1069eb1 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a1069eb1 Branch: refs/heads/HBASE-14850 Commit: a1069eb13978213027d34a09e4a15f3fdea83f5d Parents: 2aaadab Author: Elliott Clark <ecl...@apache.org> Authored: Wed Apr 27 10:51:05 2016 -0700 Committer: Elliott Clark <ecl...@apache.org> Committed: Mon Jul 11 16:47:26 2016 -0700 ---------------------------------------------------------------------- hbase-native-client/Dockerfile | 4 +++- hbase-native-client/bin/start-docker.sh | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/a1069eb1/hbase-native-client/Dockerfile ---------------------------------------------------------------------- diff --git a/hbase-native-client/Dockerfile b/hbase-native-client/Dockerfile index 1524c56..8e33e74 100644 --- a/hbase-native-client/Dockerfile +++ b/hbase-native-client/Dockerfile @@ -15,13 +15,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM pjameson/buck-folly-watchman +FROM pjameson/buck-folly-watchman:20160425 ARG CC=/usr/bin/gcc-5 ARG CXX=/usr/bin/g++-5 ARG CFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -fPIC -g -fno-omit-frame-pointer -O2 -pthread" ARG CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -fPIC -g -fno-omit-frame-pointer -O2 -pthread" +ENV JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/" + RUN apt-get install -y vim maven inetutils-ping python-pip && \ pip install yapf && \ apt-get -qq clean && \ http://git-wip-us.apache.org/repos/asf/hbase/blob/a1069eb1/hbase-native-client/bin/start-docker.sh ---------------------------------------------------------------------- diff --git a/hbase-native-client/bin/start-docker.sh b/hbase-native-client/bin/start-docker.sh index 9cbd8b7..5c03eb9 100755 --- a/hbase-native-client/bin/start-docker.sh +++ b/hbase-native-client/bin/start-docker.sh @@ -53,7 +53,6 @@ docker build -t hbase_native . # After the image is built run the thing docker run -p 16010:16010/tcp \ - -e "JAVA_HOME=/usr/lib/jvm/java-8-oracle" \ -v ${BASE_DIR}/..:/usr/src/hbase \ -v ~/.m2:/root/.m2 \ -it hbase_native /bin/bash