Skip to content

Commit b3aa6f0

Browse files
author
akmorrow13
committed
update Spark version to 2.4.3
1 parent c1641aa commit b3aa6f0

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

mango/build/Dockerfile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,21 @@ WORKDIR /home
1313
RUN git clone https://github.com/bigdatagenomics/mango.git
1414
ENV MAVEN_OPTS "-Xmx2g"
1515

16+
RUN apt-get update && apt-get install -y \
17+
unzip \
18+
npm \
19+
nodejs
20+
1621
# build mango
1722
WORKDIR /home/mango
18-
19-
RUN /opt/apache-maven-3.3.9/bin/mvn package -DskipTests
23+
RUN /opt/apache-maven-3.3.9/bin/mvn clean package -DskipTests
24+
RUN ls /home/mango/mango-cli/src/main/webapp/resources
25+
26+
# where is node_modules?
27+
RUN mkdir /home/mango/mango-assembly/target/test
28+
WORKDIR /home/mango/mango-assembly/target
29+
RUN unzip mango-assembly-0.0.3-SNAPSHOT.jar -d /home/mango/mango-assembly/target/test
30+
RUN ls test/resources/node_modules/pileup
2031

2132
# remove git libraries to avoid permission errors when copying
2233
RUN rm -rf /home/mango/.git

mango/runtime/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@ MAINTAINER Alyssa Morrow, akmorrow@berkeley.edu
66
RUN mkdir /opt/cgl-docker-lib
77
COPY mango /opt/cgl-docker-lib/mango
88

9+
WORKDIR /opt/cgl-docker-lib/mango
10+
911
# copy spark
1012
COPY apache-spark /opt/cgl-docker-lib/apache-spark
1113

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

1416
# put mango jar on the pyspark path for packaging
1517
ENV ASSEMBLY_DIR /opt/cgl-docker-lib/mango/mango-assembly/target
18+
RUN ls /opt/cgl-docker-lib/mango/mango-cli/src/main/webapp/resources
19+
1620
ENV ASSEMBLY_JAR "$(ls -1 "$ASSEMBLY_DIR" | grep "^mango-assembly[0-9A-Za-z\_\.-]*\.jar$" | grep -v javadoc | grep -v sources || true)"
1721
ENV PYSPARK_SUBMIT_ARGS "--jars ${ASSEMBLY_DIR}/${ASSEMBLY_JAR} --driver-class-path ${ASSEMBLY_DIR}/${ASSEMBLY_JAR} pyspark-shell"
1822

spark-and-maven/build/download.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ mirror=$(python -c "from urllib2 import urlopen; import json; print json.load( u
77

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

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

0 commit comments

Comments
 (0)