浏览代码

HUE-9020 [core] Improve Hue and Hue Load Balancer docker image generation.

Change-Id: I1c379e188c6b2b3015321f371331d02114c1a31c
Prakash Ranade 6 年之前
父节点
当前提交
94d8924c07
共有 2 个文件被更改,包括 13 次插入8 次删除
  1. 6 3
      tools/container/hue/Dockerfile
  2. 7 5
      tools/container/huelb/Dockerfile

+ 6 - 3
tools/container/hue/Dockerfile

@@ -26,8 +26,10 @@ ENV NAME="hue" \
 # create hue user
 RUN groupadd -g 1123 ${HUEUSER} && useradd -g 1123 -d ${HUE_HOME} -s /bin/bash -u 1123 ${HUEUSER}
 
-COPY --chown=${HUEUSER}:${HUEUSER} hue ${HUE_HOME}
-COPY --chown=${HUEUSER}:${HUEUSER} hue.sh ${HUE_HOME}/hue.sh
+COPY hue ${HUE_HOME}
+COPY hue.sh ${HUE_HOME}/hue.sh
+
+RUN chown -R ${HUEUSER}:${HUEUSER} ${HUE_HOME}
 
 # Install psycopg2-binary
 RUN $HUE_BIN/pip install /tmp/psycopg2_binary-2.8.3-cp27-cp27mu-manylinux1_x86_64.whl
@@ -40,7 +42,8 @@ RUN mkdir -p ${HUE_CONF} && chown -R ${HUEUSER}:${HUEUSER} ${HUE_CONF}
 RUN echo "${HUEUSER} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${HUEUSER} && \
     chmod 0440 /etc/sudoers.d/${HUEUSER}
 
-COPY --chown=${HUEUSER}:${HUEUSER} hueconf ${HUE_CONF}/conf
+COPY hueconf ${HUE_CONF}/conf
+RUN chown -R ${HUEUSER}:${HUEUSER} ${HUE_CONF}/conf
 
 RUN ln -s ${HUE_CONF}/conf/log.conf ${HUE_HOME}/desktop/conf/log.conf; \
     ln -s ${HUE_CONF}/conf/log4j.properties ${HUE_HOME}/desktop/conf/log4j.properties

+ 7 - 5
tools/container/huelb/Dockerfile

@@ -28,11 +28,13 @@ RUN groupadd -g 1123 ${HUEUSER} && useradd -g 1123 -d ${HUE_HOME} -s /bin/bash -
 RUN mkdir -p ${HUE_LOG_DIR} && chown -R ${HUEUSER}:${HUEUSER} ${HUE_LOG_DIR}
 RUN echo "Include /etc/httpd/conf.d/hue_httpd.conf" >> /etc/httpd/conf/httpd.conf
 
-COPY --chown=${HUEUSER}:${HUEUSER} static ${HUE_HOME}/build/static
-COPY --chown=${HUEUSER}:${HUEUSER} hue_httpd.conf /etc/httpd/conf.d/hue_httpd.conf
-COPY --chown=${HUEUSER}:${HUEUSER} hue.conf /etc/httpd/conf.d/hue.conf
-COPY --chown=${HUEUSER}:${HUEUSER} run_httpd.sh ${HUE_HOME}
-RUN chmod -v +x ${HUE_HOME}/run_httpd.sh
+COPY static ${HUE_HOME}/build/static
+COPY hue_httpd.conf /etc/httpd/conf.d/hue_httpd.conf
+COPY hue.conf /etc/httpd/conf.d/hue.conf
+COPY run_httpd.sh ${HUE_HOME}
+RUN chown -R ${HUEUSER}:${HUEUSER} ${HUE_HOME}/build/static \
+      /etc/httpd/conf.d/hue* \
+      ${HUE_HOME}/run_httpd.sh && chmod -v +x ${HUE_HOME}/run_httpd.sh
 
 EXPOSE 80
 # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop