Просмотр исходного кода

HUE-9092 [core] Fix Hue ProgrammingError at /hue/accounts/login when opening first time when db connectivity is down

(cherry picked from commit 077a5dd58f47de97d7d9bb0886c66b0f1b4bcc79)
Prakash Ranade 6 лет назад
Родитель
Сommit
59ebe432c5

+ 1 - 1
tools/container/base/hue/Dockerfile

@@ -1,4 +1,4 @@
-FROM ${BASEOS_URL}
+FROM docker-private.infra.cloudera.com/cloudera_base/centos:7.6.1810 as base-centos-jdk
 
 LABEL description="Hue Project https://github.com/cloudera/hue"
 

+ 1 - 1
tools/container/base/huelb/Dockerfile

@@ -1,4 +1,4 @@
-FROM ${BASEOS_URL}
+FROM docker-private.infra.cloudera.com/cloudera_base/centos:7.6.1810 as base-centos-jdk
 
 LABEL description="Hue Project https://github.com/cloudera/hue"
 

+ 0 - 21
tools/container/build.sh

@@ -15,11 +15,6 @@ HUEUSER="hive"
 
 if [ -z "$REGISTRY" ]; then
   REGISTRY=${REGISTRY:-"docker.io/hortonworks"}
-  BASEOS_URL=${REGISTRY:-"docker.io/centos:centos7"}
-else
-  if [[ $REGISTRY == *cdh ]]; then
-    BASEOS_URL=$(echo $(echo $REGISTRY | cut -d '/' -f 1)/cloudera_base/centos:7.6.1810)
-  fi
 fi
 
 compile_hue() {
@@ -121,33 +116,17 @@ build_huelbbase() {
   docker pull ${REGISTRY}/$HUELBBASE_VERSION
 }
 
-pull_hueos() {
-  docker pull ${BASEOS_URL}
-
-  FROMOS_URL=$(echo "$BASEOS_URL as base-centos-jdk")
-  sed -i -e "s#\${BASEOS_URL}#${FROMOS_URL}#g" $BASEHUE_DIR/Dockerfile
-}
-
-pull_huelbos() {
-  docker pull ${BASEOS_URL}
-
-  FROMOS_URL=$(echo "$BASEOS_URL as base-centos-jdk")
-  sed -i -e "s#\${BASEOS_URL}#${FROMOS_URL}#g" $BASEHUELB_DIR/Dockerfile
-}
-
 pull_base_images() {
   set +e
 
   docker pull ${REGISTRY}/$HUEBASE_VERSION
   if [[ $? != 0 ]]; then
-    pull_hueos
     build_huebase
   fi
   docker tag ${REGISTRY}/$HUEBASE_VERSION $HUEBASE_VERSION
 
   docker pull ${REGISTRY}/$HUELBBASE_VERSION
   if [[ $? != 0 ]]; then
-    pull_huelbos
     build_huelbbase
   fi
   docker tag ${REGISTRY}/$HUELBBASE_VERSION $HUELBBASE_VERSION