Skip to content

Commit

Permalink
update Spark version to 2.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
akmorrow13 committed Jul 1, 2019
1 parent c1641aa commit b3aa6f0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
15 changes: 13 additions & 2 deletions mango/build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,21 @@ WORKDIR /home
RUN git clone https://github.com/bigdatagenomics/mango.git
ENV MAVEN_OPTS "-Xmx2g"

RUN apt-get update && apt-get install -y \
unzip \
npm \
nodejs

# build mango
WORKDIR /home/mango

RUN /opt/apache-maven-3.3.9/bin/mvn package -DskipTests
RUN /opt/apache-maven-3.3.9/bin/mvn clean package -DskipTests
RUN ls /home/mango/mango-cli/src/main/webapp/resources

# where is node_modules?
RUN mkdir /home/mango/mango-assembly/target/test
WORKDIR /home/mango/mango-assembly/target
RUN unzip mango-assembly-0.0.3-SNAPSHOT.jar -d /home/mango/mango-assembly/target/test
RUN ls test/resources/node_modules/pileup

# remove git libraries to avoid permission errors when copying
RUN rm -rf /home/mango/.git
Expand Down
4 changes: 4 additions & 0 deletions mango/runtime/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ MAINTAINER Alyssa Morrow, [email protected]
RUN mkdir /opt/cgl-docker-lib
COPY mango /opt/cgl-docker-lib/mango

WORKDIR /opt/cgl-docker-lib/mango

# copy spark
COPY apache-spark /opt/cgl-docker-lib/apache-spark

ENV SPARK_HOME /opt/cgl-docker-lib/apache-spark

# put mango jar on the pyspark path for packaging
ENV ASSEMBLY_DIR /opt/cgl-docker-lib/mango/mango-assembly/target
RUN ls /opt/cgl-docker-lib/mango/mango-cli/src/main/webapp/resources

ENV ASSEMBLY_JAR "$(ls -1 "$ASSEMBLY_DIR" | grep "^mango-assembly[0-9A-Za-z\_\.-]*\.jar$" | grep -v javadoc | grep -v sources || true)"
ENV PYSPARK_SUBMIT_ARGS "--jars ${ASSEMBLY_DIR}/${ASSEMBLY_JAR} --driver-class-path ${ASSEMBLY_DIR}/${ASSEMBLY_JAR} pyspark-shell"

Expand Down
2 changes: 1 addition & 1 deletion spark-and-maven/build/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mirror=$(python -c "from urllib2 import urlopen; import json; print json.load( u

# pull down spark
mkdir /opt/apache-spark
curl ${mirror}spark/spark-2.3.2/spark-2.3.2-bin-hadoop2.7.tgz \
curl ${mirror}spark/spark-2.4.3/spark-2.4.3-bin-hadoop2.7.tgz \
| tar --strip-components=1 -xzC /opt/apache-spark

# we rely on apache maven > 3.1.1 to build ADAM, so we can't use the
Expand Down

0 comments on commit b3aa6f0

Please sign in to comment.