Răsfoiți Sursa

Add tools/scripts to docker build

(cherry picked from commit 4cdc7bf3cff5d657be1d44225382a32ddd02d0bc)
Athithyaa Selvam 1 lună în urmă
părinte
comite
48f5005d3b
2 a modificat fișierele cu 11 adăugiri și 0 ștergeri
  1. 6 0
      tools/container/build.sh
  2. 5 0
      tools/docker/hue/Dockerfile

+ 6 - 0
tools/container/build.sh

@@ -63,6 +63,12 @@ docker_hue_build() {
   cp -a $BUILD_DIR/${HUEUSER} $HUE_DIR
   rm -f $HUE_DIR/${HUEUSER}/desktop/conf/*
 
+  # Include tools/scripts for multi-python wrapper and helpers
+  mkdir -p $HUE_DIR/${HUEUSER}/tools/scripts
+  cp -a $HUE_SRC/tools/scripts/* $HUE_DIR/${HUEUSER}/tools/scripts/
+  chmod +x $HUE_DIR/${HUEUSER}/tools/scripts/*.sh 2>/dev/null || true
+  chmod +x $HUE_DIR/${HUEUSER}/tools/scripts/python/*.sh 2>/dev/null || true
+
   # Remove chardet package
   rm -rf $HUE_DIR/${HUEUSER}/tools/virtual-bootstrap/virtualenv_support
 

+ 5 - 0
tools/docker/hue/Dockerfile

@@ -57,6 +57,11 @@ RUN pip3 install --upgrade --no-cache-dir setuptools virtualenv pip && \
   rm -rf /var/lib/apt/lists/* && \
   cp -r /hue/tools/docker/hue/conf3/* /usr/share/hue/desktop/conf/ && \
   cp /hue/tools/docker/hue/startup.sh /usr/share/hue/startup.sh && \
+  # Include tools/scripts for multi-python wrapper and helpers
+  mkdir -p /usr/share/hue/tools/scripts && \
+  cp -r /hue/tools/scripts/* /usr/share/hue/tools/scripts/ && \
+  chmod +x /usr/share/hue/tools/scripts/*.sh || true && \
+  chmod +x /usr/share/hue/tools/scripts/python/*.sh || true && \
   mkdir -p /usr/share/hue/tools/slack && \
   cp /hue/tools/slack/manifest.yml /usr/share/hue/tools/slack/manifest.yml && \
   rm -rf /hue && \