You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sedona.apache.org by ji...@apache.org on 2024/01/26 18:28:05 UTC
(sedona) 01/01: Fix bugs
This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a commit to branch fix-docker
in repository https://gitbox.apache.org/repos/asf/sedona.git
commit 466103e004e54c3f4efe315a8353d0e83deb887d
Author: Jia Yu <ji...@apache.org>
AuthorDate: Fri Jan 26 10:27:42 2024 -0800
Fix bugs
---
.../sedona-jupyterlab.dockerfile | 1 +
docker/sedona.sh | 17 ++++++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/docker/sedona-spark-jupyterlab/sedona-jupyterlab.dockerfile b/docker/sedona-spark-jupyterlab/sedona-jupyterlab.dockerfile
index e88095b82..a711bed9c 100644
--- a/docker/sedona-spark-jupyterlab/sedona-jupyterlab.dockerfile
+++ b/docker/sedona-spark-jupyterlab/sedona-jupyterlab.dockerfile
@@ -60,6 +60,7 @@ RUN find /opt/workspace/examples/ -type f -name "*.ipynb" -exec sed -i 's/config
# Delete packages configured by the notebooks
RUN find /opt/workspace/examples/ -type f -name "*.ipynb" -exec sed -i '/spark\.jars\.packages/d' {} +
RUN find /opt/workspace/examples/ -type f -name "*.ipynb" -exec sed -i '/org\.apache\.sedona:sedona-spark-shaded-/d' {} +
+RUN find /opt/workspace/examples/ -type f -name "*.ipynb" -exec sed -i '/org\.apache\.sedona:sedona-spark-/d' {} +
RUN find /opt/workspace/examples/ -type f -name "*.ipynb" -exec sed -i '/org\.datasyslab:geotools-wrapper:/d' {} +
RUN find /opt/workspace/examples/ -type f -name "*.ipynb" -exec sed -i '/uk\.co\.gresearch\.spark:spark-extension_2\.12:/d' {} +
diff --git a/docker/sedona.sh b/docker/sedona.sh
index d760cd9e6..84558ed60 100755
--- a/docker/sedona.sh
+++ b/docker/sedona.sh
@@ -38,16 +38,19 @@ else
# Code to execute when SEDONA_VERSION is not "latest"
# Download Sedona
curl https://repo1.maven.org/maven2/org/apache/sedona/sedona-spark-shaded-${sedona_spark_version}_2.12/${sedona_version}/sedona-spark-shaded-${sedona_spark_version}_2.12-${sedona_version}.jar -o $SPARK_HOME/jars/sedona-spark-shaded-${sedona_spark_version}_2.12-${sedona_version}.jar
- curl https://repo1.maven.org/maven2/org/datasyslab/geotools-wrapper/${geotools_wrapper_version}/geotools-wrapper-${geotools_wrapper_version}.jar -o $SPARK_HOME/jars/geotools-wrapper-${geotools_wrapper_version}.jar
-
- # Download gresearch spark extension
- curl https://repo1.maven.org/maven2/uk/co/gresearch/spark/spark-extension_2.12/${spark_extension_version}-${sedona_spark_version}/spark-extension_2.12-${spark_extension_version}-${sedona_spark_version}.jar -o $SPARK_HOME/jars/spark-extension_2.12-${spark_extension_version}-${sedona_spark_version}.jar
# Install Sedona Python
pip3 install shapely==1.8.4
pip3 install apache-sedona==${sedona_version}
- # Install Spark extension Python
- pip3 install pyspark-extension==${spark_extension_version}.${sedona_spark_version}
-
fi
+
+# Download gresearch spark extension
+curl https://repo1.maven.org/maven2/uk/co/gresearch/spark/spark-extension_2.12/${spark_extension_version}-${sedona_spark_version}/spark-extension_2.12-${spark_extension_version}-${sedona_spark_version}.jar -o $SPARK_HOME/jars/spark-extension_2.12-${spark_extension_version}-${sedona_spark_version}.jar
+
+# Install Spark extension Python
+pip3 install pyspark-extension==${spark_extension_version}.${sedona_spark_version}
+
+# Download GeoTools jar
+curl https://repo1.maven.org/maven2/org/datasyslab/geotools-wrapper/${geotools_wrapper_version}/geotools-wrapper-${geotools_wrapper_version}.jar -o $SPARK_HOME/jars/geotools-wrapper-${geotools_wrapper_version}.jar
+