Verse add on option for Domino image

HCL-TECH-SOFTWARE · Jan 30, 2021 · e74b089 · e74b089
1 parent 671747a
commit e74b089
Show file tree

Hide file tree

Showing 25 changed files with 142 additions and 22 deletions.
diff --git a/build.sh b/build.sh
@@ -180,6 +180,7 @@ dump_config ()
   echo "DOWNLOAD_URLS_SHOW : [$DOWNLOAD_URLS_SHOW]"
   echo "TAG_LATEST         : [$TAG_LATEST]"
   echo "DOCKER_FILE        : [$DOCKER_FILE]"
+  echo "VERSE_VERSION      : [$VERSE_VERSION]"
   echo "LinuxYumUpdate     : [$LinuxYumUpdate]"
   echo 
   return 0
@@ -298,6 +299,10 @@ for a in $@; do
       PROD_NAME=$p
       ;;
 
+    verse=*)
+      VERSE_VERSION=`echo "$a" | cut -f2 -d=`
+      ;;
+
     9*|10*|11*|12*)
       PROD_VER=$p
       ;;
@@ -419,8 +424,6 @@ if [ -n "$BASE_IMAGE" ]; then
   # don't check software
   CHECK_SOFTWARE=no
   CHECK_HASH=no
-  DOWNLOAD_FROM=DUMMY
-
 fi
 
 TARGET_IMAGE=$PROD_NAME
@@ -492,13 +495,13 @@ fi
 echo
 
 if [ -z "$TARGET_IMAGE" ]; then
-  echo "No Taget Image specified! - Terminating"
+  echo "No Target Image specified! - Terminating"
   echo
   exit 1
 fi
 
 if [ -z "$PROD_VER" ]; then
-  echo "No Taget version specified! - Terminating"
+  echo "No Target version specified! - Terminating"
   echo
   exit 1
 fi
@@ -522,6 +525,7 @@ export PROD_VER
 export PROD_FP
 export PROD_HF
 export PROD_EXT
+export VERSE_VERSION
 export CHECK_SOFTWARE
 export CHECK_HASH
 export DOWNLOAD_URLS_SHOW

diff --git a/check_software.sh b/check_software.sh
@@ -244,6 +244,13 @@ check_software_status ()
     check_software_file "domino-ce"
     check_software_file "traveler"
     check_software_file "proton"
+
+
+    if [ -n "$VERSE_VERSION" ]; then
+      check_software_file "verse" "$VERSE_VERSION"
+    fi
+
+
   else
     echo
 
@@ -260,6 +267,11 @@ check_software_status ()
         check_software_file "$PROD_NAME" "$PROD_VER$PROD_FP$PROD_HF"
       fi
     fi
+
+    if [ -n "$VERSE_VERSION" ]; then
+      check_software_file "verse" "$VERSE_VERSION"
+    fi
+
     echo
   fi
 }

diff --git a/dockerfiles/domino/build_domino.sh b/dockerfiles/domino/build_domino.sh
@@ -284,7 +284,9 @@ docker_build ()
     --build-arg DominoMoveInstallData=$DominoMoveInstallData \
     --build-arg GIT_INSTALL="$GIT_INSTALL" \
     --build-arg OPENSSL_INSTALL="$OPENSSL_INSTALL" \
-    --build-arg SPECIAL_WGET_ARGUMENTS="$SPECIAL_WGET_ARGUMENTS" .
+    --build-arg VERSE_VERSION="$VERSE_VERSION" \
+    --build-arg SPECIAL_WGET_ARGUMENTS="$SPECIAL_WGET_ARGUMENTS" \
+    --build-arg SPECIAL_CURL_ARGUMENTS="$SPECIAL_CURL_ARGUMENTS" .
 
   popd
   echo

diff --git a/dockerfiles/domino/dockerfile b/dockerfiles/domino/dockerfile
@@ -24,6 +24,7 @@ ARG GIT_INSTALL=
 ARG OPENSSL_INSTALL=
 ARG SPECIAL_CURL_ARGS=
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG VERSE_VERSION=
 
 USER root
 

diff --git a/dockerfiles/domino/dockerfile_centos8 b/dockerfiles/domino/dockerfile_centos8
@@ -24,6 +24,7 @@ ARG GIT_INSTALL=
 ARG OPENSSL_INSTALL=
 ARG SPECIAL_CURL_ARGS=
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG VERSE_VERSION=
 
 USER root
 

diff --git a/dockerfiles/domino/dockerfile_hcl b/dockerfiles/domino/dockerfile_hcl
@@ -23,6 +23,7 @@ ARG GIT_INSTALL=
 ARG OPENSSL_INSTALL=
 ARG SPECIAL_CURL_ARGS=
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG VERSE_VERSION=
 
 USER root
 

diff --git a/dockerfiles/domino/dockerfile_leap b/dockerfiles/domino/dockerfile_leap
@@ -23,6 +23,7 @@ ARG GIT_INSTALL=
 ARG OPENSSL_INSTALL=
 ARG SPECIAL_CURL_ARGS=
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG VERSE_VERSION=
 
 USER root
 

diff --git a/dockerfiles/domino/dockerfile_orel b/dockerfiles/domino/dockerfile_orel
@@ -24,6 +24,7 @@ ARG GIT_INSTALL=
 ARG OPENSSL_INSTALL=
 ARG SPECIAL_CURL_ARGS=
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG VERSE_VERSION=
 
 USER root
 

diff --git a/dockerfiles/domino/dockerfile_ubi b/dockerfiles/domino/dockerfile_ubi
@@ -24,6 +24,7 @@ ARG GIT_INSTALL=
 ARG OPENSSL_INSTALL=
 ARG SPECIAL_CURL_ARGS=
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG VERSE_VERSION=
 
 USER root
 

diff --git a/dockerfiles/domino/install_dir/install_domino.sh b/dockerfiles/domino/install_dir/install_domino.sh
@@ -39,6 +39,8 @@ export PATH=$PATH:$DOMINO_DATA_PATH
 SOFTWARE_FILE=$INSTALL_DIR/software.txt
 CURL_CMD="curl --fail --connect-timeout 15 --max-time 300 $SPECIAL_CURL_ARGS"
 
+DIR_PERM=770
+
 # Helper Functions
 
 DOM_V10_STRING_OK="Dominoserver Installation successful"
@@ -174,7 +176,10 @@ download_file_ifpresent ()
   fi
 
   pushd .
-  cd $TARGET_DIR
+  if [ -n "$TARGET_DIR" ]; then
+    mkdir -p "$TARGET_DIR"
+    cd $TARGET_DIR
+  fi
 
   if [ -e "$DOWNLOAD_FILE" ]; then
   	echo
@@ -231,7 +236,7 @@ download_and_check_hash ()
 
   pushd .
 
-  if [ ! -z "$TARGET_DIR" ]; then
+  if [ -n "$TARGET_DIR" ]; then
     mkdir -p "$TARGET_DIR"
     cd "$TARGET_DIR"
   fi
@@ -248,22 +253,27 @@ download_and_check_hash ()
 
   if [ -z "$TAR_OPTIONS" ]; then
 
-    # download without extracting for none tar files, without hash checking
+    # download without extracting for none tar files
 
     echo
-    $CURL_CMD "$DOWNLOAD_SERVER/$DOWNLOAD_FILE" -o "$(basename $DOWNLOAD_FILE)" 2>/dev/null
-    echo
+    local DOWNLOADED_FILE=$(basename $DOWNLOAD_FILE)
+    $CURL_CMD "$DOWNLOAD_FILE" -o "$DOWNLOADED_FILE"
 
-    if [ "$?" = "0" ]; then
-      log_ok "Successfully downloaded: [$DOWNLOAD_FILE] "
+    if [ ! -e "$DOWNLOADED_FILE" ]; then
+      log_error "File [$DOWNLOAD_FILE] not downloaded [1]"
       popd
-      return 0
+      exit 1
+    fi
 
+    HASH=$(sha256sum -b $DOWNLOADED_FILE | cut -f1 -d" ")
+    FOUND=$(grep "$HASH" "$SOFTWARE_FILE" | grep "$CURRENT_FILE" | wc -l)
+
+    if [ "$FOUND" = "1" ]; then
+      log_ok "Successfully downloaded: [$DOWNLOAD_FILE] "
     else
       log_error "File [$DOWNLOAD_FILE] not downloaded correctly [1]"
-      popd
-      exit 1
     fi
+
   else
     if [ -e $SOFTWARE_FILE ]; then
       echo
@@ -708,7 +718,7 @@ install_domino ()
     rm -rf domino_server
 
     # Copy license files
-    mkdir /licenses
+    mkdir -p /licenses
     cp $Notes_ExecDirectory/license/*.txt /licenses
 
   fi
@@ -791,6 +801,55 @@ install_domino ()
   return 0
 }
 
+install_osgi_file()
+{
+  local SOURCE=$1
+  local TARGET="$PLUGINS_FOLDER/$(basename $1)"
+
+  install_file "$SOURCE" "$TARGET" root root 755
+}
+
+install_verse()
+{
+  local ADDON_NAME=verse
+  local ADDON_VER=$1
+
+  if [ -z "$ADDON_VER" ]; then
+    return 0
+  fi
+
+  header "$ADDON_NAME Installation"
+
+  get_download_name $ADDON_NAME $ADDON_VER
+  download_and_check_hash "$DownloadFrom" "$DOWNLOAD_NAME" "$ADDON_NAME"
+
+  header "Installing $ADDON_NAME $ADDON_VER"
+
+  OSGI_FOLDER="$Notes_ExecDirectory/osgi"
+  PLUGINS_FOLDER=$OSGI_FOLDER"/eclipse/plugins"
+
+  mkdir -p $PLUGINS_FOLDER
+  pushd .
+  cd $ADDON_NAME
+  echo "Unzipping files .."
+  unzip -q  *.zip
+  unzip -q HCL_Verse.zip 
+
+  echo "Copying files .."
+
+  for JAR in eclipse/plugins/*.jar; do
+    install_osgi_file "$JAR"
+  done
+
+  install_file "iwaredir.ntf" "$DOMINO_DATA_PATH/iwaredir.ntf" $DOMINO_USER $DOMINO_GROUP 644
+
+  echo
+  echo Installed $ADDON_NAME
+  echo
+
+  popd
+
+}
 
 docker_set_timezone ()
 {
@@ -916,6 +975,7 @@ echo "DominoMoveInstallData = [$DominoMoveInstallData]"
 echo "DominoVersion         = [$DominoVersion]"
 echo "DominoUserID          = [$DominoUserID]"
 echo "LinuxYumUpdate        = [$LinuxYumUpdate]"
+echo "VERSE_VERSION         = [$VERSE_VERSION]"
 
 # Install CentOS updates if requested
 if [ "$LinuxYumUpdate" = "yes" ]; then
@@ -1069,6 +1129,9 @@ case "$PROD_NAME" in
     ;;
 esac
 
+# Install Verse if requested
+install_verse "$VERSE_VERSION"
+
 # removing perl if temporary installed
 
 if [ "$UNINSTALL_PERL_AFTER_INSTALL" = "yes" ]; then

diff --git a/dockerfiles/domino/install_dir/software.txt b/dockerfiles/domino/install_dir/software.txt
@@ -24,4 +24,5 @@ iam|1.0.1|DOMINO_APPDEV_PACK_1.0.1_MP_EN.tgz|CC0NGEN|fd04a8c61ee6b0887c5ccfb3be8
 volt|1.0.0.5|hcl.domino.volt-1.0.0.5.zip|-|0ade3cdb0d5c5171faeb1d4a202584eb0f4245378e8145687cb51cc5839c9688
 volt|1.0.1.9|hcl.domino.volt-1.0.1.9.zip|-|e8978481109a7bc3a92848fb2043ec409843cd3c9c0a6146a98622e3f2c30755
 volt|1.0.2.9|hcl.domino.volt-1.0.2.9.zip|-|e65b922f93e7143472a02b1a8f2925424c3b08e416afa2504ee97b5d460b97a9
+verse|2.0.1|HCL_Verse_2.0.1.zip|-|ce358d16d338e9a81b3402bb081ea3a2b39e6915e0f4670107df7144f1004ea8
 
diff --git a/dockerfiles/traveler/build_traveler.sh b/dockerfiles/traveler/build_traveler.sh
@@ -222,7 +222,8 @@ docker_build ()
     --build-arg PROD_VER="$PROD_VER" \
     --build-arg DownloadFrom="$DOWNLOAD_FROM" \
     --build-arg LinuxYumUpdate="$LinuxYumUpdate" \
-    --build-arg SPECIAL_WGET_ARGUMENTS="$SPECIAL_WGET_ARGUMENTS" .
+    --build-arg SPECIAL_WGET_ARGUMENTS="$SPECIAL_WGET_ARGUMENTS" \
+    --build-arg SPECIAL_CURL_ARGUMENTS="$SPECIAL_CURL_ARGUMENTS" .
 
   popd
   echo

diff --git a/dockerfiles/traveler/dockerfile_domino10 b/dockerfiles/traveler/dockerfile_domino10
@@ -15,6 +15,7 @@ ARG PROD_FP=
 ARG PROD_HF=
 ARG LocalInstallDir=/tmp/install
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG SPECIAL_CURL_ARGUMENTS=
 
 USER root
 

diff --git a/dockerfiles/traveler/dockerfile_domino11 b/dockerfiles/traveler/dockerfile_domino11
@@ -15,6 +15,7 @@ ARG PROD_FP=
 ARG PROD_HF=
 ARG LocalInstallDir=/tmp/install
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG SPECIAL_CURL_ARGUMENTS=
 
 USER root
 

diff --git a/dockerfiles/traveler/dockerfile_domino11_ubi b/dockerfiles/traveler/dockerfile_domino11_ubi
@@ -15,6 +15,7 @@ ARG PROD_FP=
 ARG PROD_HF=
 ARG LocalInstallDir=/tmp/install
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG SPECIAL_CURL_ARGUMENTS=
 
 USER root
 

diff --git a/dockerfiles/traveler/dockerfile_domino12 b/dockerfiles/traveler/dockerfile_domino12
@@ -14,6 +14,7 @@ ARG PROD_FP=
 ARG PROD_HF=
 ARG LocalInstallDir=/tmp/install
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG SPECIAL_CURL_ARGUMENTS=
 
 USER root
 

diff --git a/dockerfiles/traveler/install_dir/software.txt b/dockerfiles/traveler/install_dir/software.txt
@@ -24,4 +24,5 @@ iam|1.0.1|DOMINO_APPDEV_PACK_1.0.1_MP_EN.tgz|CC0NGEN|fd04a8c61ee6b0887c5ccfb3be8
 volt|1.0.0.5|hcl.domino.volt-1.0.0.5.zip|-|0ade3cdb0d5c5171faeb1d4a202584eb0f4245378e8145687cb51cc5839c9688
 volt|1.0.1.9|hcl.domino.volt-1.0.1.9.zip|-|e8978481109a7bc3a92848fb2043ec409843cd3c9c0a6146a98622e3f2c30755
 volt|1.0.2.9|hcl.domino.volt-1.0.2.9.zip|-|e65b922f93e7143472a02b1a8f2925424c3b08e416afa2504ee97b5d460b97a9
+verse|2.0.1|HCL_Verse_2.0.1.zip|-|ce358d16d338e9a81b3402bb081ea3a2b39e6915e0f4670107df7144f1004ea8
 
diff --git a/dockerfiles/volt/build_volt.sh b/dockerfiles/volt/build_volt.sh
@@ -202,7 +202,8 @@ docker_build ()
     --build-arg PROD_VER="$PROD_VER" \
     --build-arg DownloadFrom="$DOWNLOAD_FROM" \
     --build-arg LinuxYumUpdate="$LinuxYumUpdate" \
-    --build-arg SPECIAL_WGET_ARGUMENTS="$SPECIAL_WGET_ARGUMENTS" .
+    --build-arg SPECIAL_WGET_ARGUMENTS="$SPECIAL_WGET_ARGUMENTS" \
+    --build-arg SPECIAL_CURL_ARGUMENTS="$SPECIAL_CURL_ARGUMENTS" .
 
   popd
   echo

diff --git a/dockerfiles/volt/dockerfile_domino10 b/dockerfiles/volt/dockerfile_domino10
@@ -14,6 +14,7 @@ ARG PROD_FP=
 ARG PROD_HF=
 ARG LocalInstallDir=/tmp/install
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG SPECIAL_CURL_ARGUMENTS=
 
 USER root
 

diff --git a/dockerfiles/volt/dockerfile_domino11 b/dockerfiles/volt/dockerfile_domino11
@@ -14,6 +14,7 @@ ARG PROD_FP=
 ARG PROD_HF=
 ARG LocalInstallDir=/tmp/install
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG SPECIAL_CURL_ARGUMENTS=
 
 USER root
 

diff --git a/dockerfiles/volt/dockerfile_domino11_ubi b/dockerfiles/volt/dockerfile_domino11_ubi
@@ -14,6 +14,7 @@ ARG PROD_FP=
 ARG PROD_HF=
 ARG LocalInstallDir=/tmp/install
 ARG SPECIAL_WGET_ARGUMENTS=
+ARG SPECIAL_CURL_ARGUMENTS=
 
 USER root
 

diff --git a/dockerfiles/volt/install_dir/software.txt b/dockerfiles/volt/install_dir/software.txt
@@ -24,4 +24,5 @@ iam|1.0.1|DOMINO_APPDEV_PACK_1.0.1_MP_EN.tgz|CC0NGEN|fd04a8c61ee6b0887c5ccfb3be8
 volt|1.0.0.5|hcl.domino.volt-1.0.0.5.zip|-|0ade3cdb0d5c5171faeb1d4a202584eb0f4245378e8145687cb51cc5839c9688
 volt|1.0.1.9|hcl.domino.volt-1.0.1.9.zip|-|e8978481109a7bc3a92848fb2043ec409843cd3c9c0a6146a98622e3f2c30755
 volt|1.0.2.9|hcl.domino.volt-1.0.2.9.zip|-|e65b922f93e7143472a02b1a8f2925424c3b08e416afa2504ee97b5d460b97a9
+verse|2.0.1|HCL_Verse_2.0.1.zip|-|ce358d16d338e9a81b3402bb081ea3a2b39e6915e0f4670107df7144f1004ea8
 
diff --git a/management/install_dir/software.txt b/management/install_dir/software.txt
@@ -24,4 +24,5 @@ iam|1.0.1|DOMINO_APPDEV_PACK_1.0.1_MP_EN.tgz|CC0NGEN|fd04a8c61ee6b0887c5ccfb3be8
 volt|1.0.0.5|hcl.domino.volt-1.0.0.5.zip|-|0ade3cdb0d5c5171faeb1d4a202584eb0f4245378e8145687cb51cc5839c9688
 volt|1.0.1.9|hcl.domino.volt-1.0.1.9.zip|-|e8978481109a7bc3a92848fb2043ec409843cd3c9c0a6146a98622e3f2c30755
 volt|1.0.2.9|hcl.domino.volt-1.0.2.9.zip|-|e65b922f93e7143472a02b1a8f2925424c3b08e416afa2504ee97b5d460b97a9
+verse|2.0.1|HCL_Verse_2.0.1.zip|-|ce358d16d338e9a81b3402bb081ea3a2b39e6915e0f4670107df7144f1004ea8
 
diff --git a/software/software.txt b/software/software.txt
@@ -24,4 +24,5 @@ iam|1.0.1|DOMINO_APPDEV_PACK_1.0.1_MP_EN.tgz|CC0NGEN|fd04a8c61ee6b0887c5ccfb3be8
 volt|1.0.0.5|hcl.domino.volt-1.0.0.5.zip|-|0ade3cdb0d5c5171faeb1d4a202584eb0f4245378e8145687cb51cc5839c9688
 volt|1.0.1.9|hcl.domino.volt-1.0.1.9.zip|-|e8978481109a7bc3a92848fb2043ec409843cd3c9c0a6146a98622e3f2c30755
 volt|1.0.2.9|hcl.domino.volt-1.0.2.9.zip|-|e65b922f93e7143472a02b1a8f2925424c3b08e416afa2504ee97b5d460b97a9
+verse|2.0.1|HCL_Verse_2.0.1.zip|-|ce358d16d338e9a81b3402bb081ea3a2b39e6915e0f4670107df7144f1004ea8