Skip to content

Commit 082e99e

Browse files
authored
Merge pull request #532 from s22s/feature/notebook-libs
Spark 2.4.7 upgrade. Misc pip dependency updates.
2 parents a5c6446 + c0b5477 commit 082e99e

File tree

4 files changed

+18
-782
lines changed

4 files changed

+18
-782
lines changed

experimental/src/main/scala/org/locationtech/rasterframes/experimental/datasource/ResourceCacheSupport.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ trait ResourceCacheSupport extends DownloadSupport {
8888
catch {
8989
case NonFatal(_)
9090
Try(fs.delete(dest, false))
91-
logger.warn(s"'$uri' not found")
91+
logger.debug(s"'$uri' not found")
9292
None
9393
}
9494
}

rf-notebook/src/main/docker/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ RUN \
1212
apt-get clean && \
1313
rm -rf /var/lib/apt/lists/*
1414

15-
# Spark dependencies
16-
ENV APACHE_SPARK_VERSION 2.4.5
15+
ENV APACHE_SPARK_VERSION 2.4.7
1716
ENV HADOOP_VERSION 2.7
18-
ENV APACHE_SPARK_CHECKSUM 2426a20c548bdfc07df288cd1d18d1da6b3189d0b78dee76fa034c52a4e02895f0ad460720c526f163ba63a17efae4764c46a1cd8f9b04c60f9937a554db85d2
19-
ENV APACHE_SPARK_FILENAME spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz
20-
ENV APACHE_SPARK_REMOTE_PATH spark-${APACHE_SPARK_VERSION}/${APACHE_SPARK_FILENAME}
17+
# On MacOS compute this with `shasum -a 512`
18+
ARG APACHE_SPARK_CHECKSUM="0f5455672045f6110b030ce343c049855b7ba86c0ecb5e39a075ff9d093c7f648da55ded12e72ffe65d84c32dcd5418a6d764f2d6295a3f894a4286cc80ef478"
19+
ARG APACHE_SPARK_FILENAME="spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz"
20+
ARG APACHE_SPARK_REMOTE_PATH="spark-${APACHE_SPARK_VERSION}/${APACHE_SPARK_FILENAME}"
2121

2222
RUN \
2323
cd /tmp && \
24-
wget --quiet http://apache.mirrors.pair.com/spark/${APACHE_SPARK_REMOTE_PATH} && \
24+
wget --quiet https://archive.apache.org/dist/spark/${APACHE_SPARK_REMOTE_PATH} && \
2525
echo "${APACHE_SPARK_CHECKSUM} *${APACHE_SPARK_FILENAME}" | sha512sum -c - && \
26-
tar xzf ${APACHE_SPARK_FILENAME} -C /usr/local --owner root --group root --no-same-owner && \
26+
tar xzf ${APACHE_SPARK_FILENAME} -C /opt --owner root --group root --no-same-owner && \
2727
rm ${APACHE_SPARK_FILENAME}
2828

2929
RUN cd /usr/local && ln -s spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION} spark

0 commit comments

Comments
 (0)