Small fixes on MapR image gen.

Updating the java install script and also fixing function call that is
not working on ubuntu image generation.

Change-Id: Ic6d3853e7137f5a2140628aa32e8f07428547527
changes/99/634799/4 1.0.0
Telles Nobrega 4 years ago
parent 03b85b75bb
commit 1f4353f158
  1. 2
      sahara_plugin_mapr/plugins/mapr/resources/images/common/configure_extjs
  2. 1
      sahara_plugin_mapr/plugins/mapr/resources/images/image.yaml
  3. 6
      sahara_plugin_mapr/plugins/mapr/resources/images/ubuntu/install_openjdk

@ -8,7 +8,7 @@ extjs_basepath=$(basename ${EXTJS_DOWNLOAD_URL})
extjs_archive=/tmp/${extjs_basepath}
extjs_folder="${extjs_basepath%.*}"
function setup_extjs {
setup_extjs() {
curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL
mkdir -p $EXTJS_DESTINATION_DIR
}

@ -150,7 +150,6 @@ validators:
- mysql-common
- nfs-common
- open-iscsi
- openjdk-7-jre
- syslinux-common
- zlib1g-dev
- script: common/configure_extjs

@ -4,12 +4,6 @@ echo "Installing OpenJDK"
if [ $test_only -eq 0 ]; then
apt-get install -y openjdk-7-jdk
JRE_PATH=$(update-alternatives --list java)
JRE_HOME=${JRE_PATH%/bin/java}
JDK_PATH=$(update-alternatives --list javac)
JDK_HOME=${JDK_PATH%/bin/javac}
echo "OpenJDK has been installed"
else
exit 0

Loading…
Cancel
Save