Change oshinko version to v0.4.5

radanalyticsio · Feb 26, 2018 · 7c3b156 · 7c3b156
1 parent 06fbba9
commit 7c3b156
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 12 deletions.
diff --git a/image.java.yaml b/image.java.yaml
@@ -38,8 +38,8 @@ packages:
 artifacts:
   - url: https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz
     md5: 1715b661bdf33b40c98b3daa7837f690
-  - url: https://github.com/radanalyticsio/oshinko-cli/releases/download/v0.4.4/oshinko_v0.4.4_linux_amd64.tar.gz
-    md5: 4c75df234f55e6032c8bb7492953043b
+  - url: https://github.com/radanalyticsio/oshinko-cli/releases/download/v0.4.5/oshinko_v0.4.5_linux_amd64.tar.gz
+    md5: 4c947295bdd95ab4300ffdd60321ed8a
 run:
     user: 185
     cmd:

diff --git a/image.pyspark.yaml b/image.pyspark.yaml
@@ -40,8 +40,8 @@ packages:
 artifacts:
   - url: https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz
     md5: 1715b661bdf33b40c98b3daa7837f690
-  - url: https://github.com/radanalyticsio/oshinko-cli/releases/download/v0.4.4/oshinko_v0.4.4_linux_amd64.tar.gz
-    md5: 4c75df234f55e6032c8bb7492953043b
+  - url: https://github.com/radanalyticsio/oshinko-cli/releases/download/v0.4.5/oshinko_v0.4.5_linux_amd64.tar.gz
+    md5: 4c947295bdd95ab4300ffdd60321ed8a
 run:
     user: 185
     cmd:

diff --git a/image.scala.yaml b/image.scala.yaml
@@ -39,8 +39,8 @@ artifacts:
     md5: e7e1f7ddc8873d228d611e801b8d2795
   - url: http://dl.bintray.com/sbt/native-packages/sbt/0.13.13/sbt-0.13.13.tgz
     md5: 30a238d1b0cc2821da2b9b4e830ef204
-  - url: https://github.com/radanalyticsio/oshinko-cli/releases/download/v0.4.4/oshinko_v0.4.4_linux_amd64.tar.gz
-    md5: 4c75df234f55e6032c8bb7492953043b
+  - url: https://github.com/radanalyticsio/oshinko-cli/releases/download/v0.4.5/oshinko_v0.4.5_linux_amd64.tar.gz
+    md5: 4c947295bdd95ab4300ffdd60321ed8a
 run:
   user: 185
   cmd:

diff --git a/java-build/Dockerfile b/java-build/Dockerfile
@@ -36,7 +36,8 @@ LABEL name="$JBOSS_IMAGE_NAME" \
       io.openshift.expose-services="8080:http" \
       io.openshift.s2i.scripts-url="image:///usr/local/s2i" \
       io.openshift.tags="builder,radanalytics,java_spark" \
-      io.radanalytics.sparkdistro="https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz"
+      io.radanalytics.sparkdistro="https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz" \
+      org.concrt.version="1.4.0"
 
 
 USER root
@@ -51,7 +52,7 @@ RUN yum install -y  epel-release tar wget \
 # directory
 COPY \
     spark-2.2.0-bin-hadoop2.7.tgz \
-    oshinko_v0.4.4_linux_amd64.tar.gz \
+    oshinko_v0.4.5_linux_amd64.tar.gz \
     /tmp/artifacts/
 
 # Add scripts used to configure the image

diff --git a/java-build/oshinko_v0.4.1_linux_amd64.tar.gz → java-build/oshinko_v0.4.5_linux_amd64.tar.gz b/java-build/oshinko_v0.4.1_linux_amd64.tar.gz → java-build/oshinko_v0.4.5_linux_amd64.tar.gz
diff --git a/java-build/scala-2.11.8.tgz b/java-build/scala-2.11.8.tgz
diff --git a/pyspark-build/Dockerfile b/pyspark-build/Dockerfile
@@ -38,7 +38,8 @@ LABEL name="$JBOSS_IMAGE_NAME" \
       io.openshift.expose-services="8080:http" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.openshift.tags="builder,radanalytics,pyspark" \
-      io.radanalytics.sparkdistro="https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz"
+      io.radanalytics.sparkdistro="https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz" \
+      org.concrt.version="1.4.0"
 
 
 USER root
@@ -53,7 +54,7 @@ RUN yum install -y  java-1.8.0-openjdk \
 # directory
 COPY \
     spark-2.2.0-bin-hadoop2.7.tgz \
-    oshinko_v0.4.4_linux_amd64.tar.gz \
+    oshinko_v0.4.5_linux_amd64.tar.gz \
     /tmp/artifacts/
 
 # Add scripts used to configure the image

diff --git a/pyspark-build/modules/common/added/utils/start.sh b/pyspark-build/modules/common/added/utils/start.sh
@@ -319,6 +319,9 @@ else
 
     if [ -n "$APP_MAIN_CLASS" ]; then
         CLASS_OPTION="--class $APP_MAIN_CLASS"
+    elif [ "$(unzip -p $APP_ROOT/src/$APP_FILE META-INF/MANIFEST.MF | grep -i main-class)" ]; then
+        APP_MAIN_CLASS=$(unzip -p $APP_ROOT/src/$APP_FILE META-INF/MANIFEST.MF | grep -i main-class | cut -d ':' -f 2 | sed 's/\r//')
+        CLASS_OPTION="--class $APP_MAIN_CLASS"
     fi
     echo spark-submit $CLASS_OPTION --master $master $SPARK_OPTIONS $APP_ROOT/src/$APP_FILE $APP_ARGS
     spark-submit $CLASS_OPTION --master $master $SPARK_OPTIONS $APP_ROOT/src/$APP_FILE $APP_ARGS &

diff --git a/pyspark-build/oshinko_v0.4.1_linux_amd64.tar.gz b/pyspark-build/oshinko_v0.4.1_linux_amd64.tar.gz
diff --git a/pyspark-build/oshinko_v0.4.4_linux_amd64.tar.gz b/pyspark-build/oshinko_v0.4.4_linux_amd64.tar.gz
diff --git a/java-build/oshinko_v0.4.4_linux_amd64.tar.gz → ...k-build/oshinko_v0.4.5_linux_amd64.tar.gz b/java-build/oshinko_v0.4.4_linux_amd64.tar.gz → ...k-build/oshinko_v0.4.5_linux_amd64.tar.gz
diff --git a/pyspark-build/sbt-0.13.13.tgz b/pyspark-build/sbt-0.13.13.tgz
diff --git a/pyspark-build/scala-2.11.8.tgz b/pyspark-build/scala-2.11.8.tgz
diff --git a/scala-build/Dockerfile b/scala-build/Dockerfile
@@ -36,7 +36,8 @@ LABEL name="$JBOSS_IMAGE_NAME" \
       io.openshift.expose-services="8080:http" \
       io.openshift.s2i.scripts-url="image:///usr/local/s2i" \
       io.openshift.tags="builder,radanalytics,scala_spark" \
-      io.radanalytics.sparkdistro="https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz"
+      io.radanalytics.sparkdistro="https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz" \
+      org.concrt.version="1.4.0"
 
 
 USER root
@@ -52,7 +53,7 @@ RUN yum install -y  epel-release git \
 COPY \
     scala-2.11.8.tgz \
     sbt-0.13.13.tgz \
-    oshinko_v0.4.4_linux_amd64.tar.gz \
+    oshinko_v0.4.5_linux_amd64.tar.gz \
     /tmp/artifacts/
 
 # Add scripts used to configure the image

diff --git a/scala-build/modules/common/added/utils/start.sh b/scala-build/modules/common/added/utils/start.sh
@@ -319,6 +319,9 @@ else
 
     if [ -n "$APP_MAIN_CLASS" ]; then
         CLASS_OPTION="--class $APP_MAIN_CLASS"
+    elif [ "$(unzip -p $APP_ROOT/src/$APP_FILE META-INF/MANIFEST.MF | grep -i main-class)" ]; then
+        APP_MAIN_CLASS=$(unzip -p $APP_ROOT/src/$APP_FILE META-INF/MANIFEST.MF | grep -i main-class | cut -d ':' -f 2 | sed 's/\r//')
+        CLASS_OPTION="--class $APP_MAIN_CLASS"
     fi
     echo spark-submit $CLASS_OPTION --master $master $SPARK_OPTIONS $APP_ROOT/src/$APP_FILE $APP_ARGS
     spark-submit $CLASS_OPTION --master $master $SPARK_OPTIONS $APP_ROOT/src/$APP_FILE $APP_ARGS &

diff --git a/scala-build/oshinko_v0.4.1_linux_amd64.tar.gz b/scala-build/oshinko_v0.4.1_linux_amd64.tar.gz
diff --git a/scala-build/oshinko_v0.4.4_linux_amd64.tar.gz b/scala-build/oshinko_v0.4.4_linux_amd64.tar.gz
diff --git a/java-build/sbt-0.13.13.tgz → ...a-build/oshinko_v0.4.5_linux_amd64.tar.gz b/java-build/sbt-0.13.13.tgz → ...a-build/oshinko_v0.4.5_linux_amd64.tar.gz