Skip to content

Commit

Permalink
updayed docs and docker for spark 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
sonalgoyal committed Dec 7, 2023
1 parent 768c40d commit 5833136
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
profile: [ '-Pspark-3.1', '-Pspark-3.2', '-Pspark-3.3' ]
profile: []
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#FROM docker.io/bitnami/spark:3.1.2
FROM apache/spark-py:v3.4.0
FROM apache/spark-py:v3.5.0
USER 0
RUN apt-get update && \
apt install -y curl vim
Expand Down
23 changes: 0 additions & 23 deletions docs/create-docker-multiplatform-steps.md

This file was deleted.

14 changes: 7 additions & 7 deletions docs/settingUpZingg.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ _**Step 3 : Install Apache Spark -**_
* Download Apache Spark - from the [Apache Spark Official Website](https://spark.apache.org/downloads.html).
* Install downloaded Apache Spark - on your Ubuntu by following [this tutorial](https://computingforgeeks.com/how-to-install-apache-spark-on-ubuntu-debian/).

* For example for 3.3.2:
* For example for 3.5.0:
```
wget https://dlcdn.apache.org/spark/spark-3.3.2/spark-3.3.2-bin-hadoop3.tgz
tar -xvf spark-3.3.2-bin-hadoop3.tgz
rm -rf spark-3.3.2-bin-hadoop3.tgz
sudo mv spark-3.3.2-bin-hadoop3 /opt/spark
wget https://www.apache.org/dyn/closer.lua/spark/spark-3.5.0/spark-3.5.0-bin-hadoop3.tgz
tar -xvf spark-3.5.0-bin-hadoop3.tgz
rm -rf spark-3.5.0-bin-hadoop3.tgz
sudo mv spark-3.5.0-bin-hadoop3 /opt/spark
```

Make sure that spark version you have installed is compatible with java you have installed, and Zingg is supporting those versions.

_**Note :-**_ Zingg currently supports only up to spark 3.3 and the corresponding Java version.
_**Note :-**_ Zingg supports Spark 3.5 and the corresponding Java version.

****

Expand Down Expand Up @@ -122,7 +122,7 @@ mvn initialize
* **mvn clean compile package -Dspark=sparkVer**
```

_**Note :-**_ Replace the **sparkVer** with the version of spark you installed, For example, **-Dspark=3.2** and if still facing error, include **-Dmaven.test.skip=true** with the above command.
_**Note :-**_ Replace the **sparkVer** with the version of spark you installed, For example, **-Dspark=3.5** and if still facing error, include **-Dmaven.test.skip=true** with the above command.


_**Note :-**_ substitute 3.3 with profile of the spark version you have installed. This is based on profiles specified in pom.xml
Expand Down
4 changes: 2 additions & 2 deletions docs/stepbystep/installation/compiling-from-source.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ If you need to compile the latest code or build for a different Spark version, y
* Install maven
* Install JDK 1.8
* Set JAVA\_HOME to JDK base directory
* Run the following: `mvn initialize` and then `mvn clean compile package -Dspark=sparkVer`
* Run the following: `mvn initialize` and then `mvn clean compile package`


where sparkVer is one of 3.4 or 3.5
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Zingg is prebuilt for common Spark versions so that you can use those directly.

A) Java JDK - version "1.8.0\_131"

B) Apache Spark - version spark-3.1.2-bin-hadoop3.2
B) Apache Spark - version spark-3.5.0-bin-hadoop3

****

Expand Down
26 changes: 25 additions & 1 deletion releaseActivities.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,28 @@ merge changes back to main
maven jar

Databricks Wheel
- update location of py package and maven loc of jar
- update location of py package and maven loc of jar

docker multi platform image:

on mac:

docker build -t <docker-username>/<image-name>:arm64v8 --build-arg ARCH=arm64v8/ .

docker push <docker-username>/<image-name>:arm64v8


on ubuntu:
sudo su
docker login => give username and password

docker build -t <docker-username>/<image-name>:amd64 --build-arg ARCH=amd64/ .

docker push <docker-username>/<image-name>:amd64

docker manifest create \
<docker-username>/<image-name>:latest \
--amend <docker-username>/<image-name>:amd64 \
--amend <docker-username>/<image-name>:arm64v8

docker manifest push <docker-username>/<image-name>:latest

0 comments on commit 5833136

Please sign in to comment.