Przeglądaj źródła

HUE-9163 [core] Enable HUE image to be runnable in OpenShift environment (#1050)

(cherry picked from commit 881062400d9ed189784343014ddcb1ca622a8daf)
Prakash Ranade 5 lat temu
rodzic
commit
032b0fcb40

+ 3 - 2
tools/container/hue/Dockerfile

@@ -24,7 +24,7 @@ ENV NAME="hue" \
     SUPERVISOR_VERSION=4.0.2
 
 # create hue user
-RUN groupadd -g 1123 ${HUEUSER} && useradd -g 1123 -d ${HUE_HOME} -s /bin/bash -u 1123 ${HUEUSER}
+RUN groupadd -g 1000 ${HUEUSER} && useradd -g 1000 -d ${HUE_HOME} -s /bin/bash -u 1000 ${HUEUSER}
 
 COPY hue ${HUE_HOME}
 COPY hue.sh ${HUE_HOME}/hue.sh
@@ -49,10 +49,11 @@ 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
 
 # supervisor stuff
-RUN mkdir -p /etc/supervisor.d/ && chmod +w /etc/supervisor.d && mkdir -p /var/log/root
+RUN mkdir -p /etc/supervisor.d/ && chmod +w /etc/supervisor.d && mkdir -p /var/log/root && chown -R ${HUEUSER}:${HUEUSER} /var/log/root
 ADD supervisor-files/etc/supervisord.conf /etc/supervisord.conf
 ADD supervisor-files/hue_server.conf /etc/supervisor.d/
 ADD supervisor-files/hue_ktrenewer.conf /etc/supervisor.d/
+RUN chown -R ${HUEUSER}:${HUEUSER} /etc/supervisord.conf && chown -R ${HUEUSER}:${HUEUSER} /etc/supervisor.d
 
 EXPOSE 8888 9111
 

+ 4 - 2
tools/container/huelb/Dockerfile

@@ -23,7 +23,7 @@ ENV NAME="hue" \
     SUPERVISOR_VERSION=4.0.2
 
 # create hue user
-RUN groupadd -g 1123 ${HUEUSER} && useradd -g 1123 -d ${HUE_HOME} -s /bin/bash -u 1123 ${HUEUSER}
+RUN groupadd -g 1000 ${HUEUSER} && useradd -g 1000 -d ${HUE_HOME} -s /bin/bash -u 1000 ${HUEUSER}
 
 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
@@ -32,11 +32,13 @@ 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 sed -i "s|Listen 80|Listen 8080|g" /etc/httpd/conf/httpd.conf && sed -i "s|User apache|User hive|g" /etc/httpd/conf/httpd.conf && sed -i "s|Group apache|Group hive|g" /etc/httpd/conf/httpd.conf
 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
+RUN mkdir -p /run && chown -R ${HUEUSER}:${HUEUSER} /run && mkdir -p /tmp/httpd && chown -R ${HUEUSER}:${HUEUSER} /tmp/httpd && chown -R ${HUEUSER}:${HUEUSER} /etc/httpd && chown -R ${HUEUSER}:${HUEUSER} /var/log && chown -R ${HUEUSER}:${HUEUSER} /etc/httpd/logs
 
-EXPOSE 80
+EXPOSE 8080
 # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
 STOPSIGNAL SIGINT
 

+ 1 - 1
tools/container/huelb/run_httpd.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
 mkdir -p ${HUE_LOG_DIR}
-rm -rf /run/httpd/* /tmp/httpd*
+ip_address=$(hostname -i)
 
 exec /usr/sbin/httpd -DFOREGROUND "$@"