[impala] 02/02: IMPALA-8072: remove junk configs from containers

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tarmstrong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit b66ac16375d6763e5b5a0128d66e73835dcef904
Author: Tim Armstrong <ta...@cloudera.com>
AuthorDate: Wed Apr 24 12:52:14 2019 -0700

    IMPALA-8072: remove junk configs from containers
    
    The docker containers currently have minicluster configs baked into
    them. This is not necessary any more since the /opt/impala/conf
    directory is mounted to point at the up-to-date configs, so there's
    no reason to include configs in the container.
    
    Testing:
    Confirmed that I could build containers, start up a minicluster and run
    queries.
    
    Change-Id: I6d77f79620514187a5c45483e9051bd8c40dfc9e
    Reviewed-on: http://gerrit.cloudera.org:8080/13104
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 docker/impala_base/Dockerfile | 5 +++--
 docker/setup_build_context.py | 3 ---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/docker/impala_base/Dockerfile b/docker/impala_base/Dockerfile
index 656bf7f..bd6eae8 100644
--- a/docker/impala_base/Dockerfile
+++ b/docker/impala_base/Dockerfile
@@ -28,9 +28,10 @@ RUN apt-get update && \
 # Copy build artifacts required for the daemon processes.
 # Need to have multiple copy commands to preserve directory structure.
 COPY bin /opt/impala/bin
-COPY conf /opt/impala/conf
 COPY lib /opt/impala/lib
 COPY www /opt/impala/www
-copy kudu /opt/kudu
+COPY kudu /opt/kudu
+# Create conf directory for later config injection.
+RUN mkdir /opt/impala/conf
 
 WORKDIR /opt/impala/
diff --git a/docker/setup_build_context.py b/docker/setup_build_context.py
index b673f7d..0b50fb6 100755
--- a/docker/setup_build_context.py
+++ b/docker/setup_build_context.py
@@ -70,6 +70,3 @@ for glob_pattern in [os.path.join(IMPALA_HOME, "fe/target/dependency/*.jar"),
 os.symlink(os.path.join(IMPALA_HOME, "www"), os.path.join(OUTPUT_DIR, "www"))
 # Scripts
 symlink_file_into_dir(os.path.join(IMPALA_HOME, "docker/daemon_entrypoint.sh"), BIN_DIR)
-# Minicluster configs
-os.symlink(os.path.join(IMPALA_HOME, "fe/src/test/resources"),
-    os.path.join(OUTPUT_DIR, "conf"))