diff --git a/Dockerfile b/Dockerfile index 640032aab..2a29f28f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM docker.io/bitnami/spark:3.1.2 ENV SPARK_MASTER local[*] -ENV ZINGG_HOME /zingg-0.3.2-SNAPSHOT +ENV ZINGG_HOME /zingg-0.3.3-SNAPSHOT ENV PATH $ZINGG_HOME/scripts:$PATH ENV LANG C.UTF-8 WORKDIR / USER root -WORKDIR /zingg-0.3.2-SNAPSHOT -RUN curl --location https://github.com/zinggAI/zingg/releases/download/v0.3.2/zingg-0.3.2-SNAPSHOT-spark-3.1.2.tar.gz | \ +WORKDIR /zingg-0.3.3-SNAPSHOT +RUN curl --location https://github.com/zinggAI/zingg/releases/download/v0.3.3/zingg-0.3.3-SNAPSHOT-spark-3.1.2.tar.gz | \ tar --extract --gzip --strip=1 -RUN chmod -R a+rwx /zingg-0.3.2-SNAPSHOT/models -RUN chown -R 1001 /zingg-0.3.2-SNAPSHOT/models +RUN chmod -R a+rwx /zingg-0.3.3-SNAPSHOT/models +RUN chown -R 1001 /zingg-0.3.3-SNAPSHOT/models USER 1001 diff --git a/README.md b/README.md index 7c5758649..23c7600cf 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,8 @@ See Zingg in action [here](https://www.youtube.com/watch?v=zOabyZxN9b0) The easiest way to get started with Zingg is through Docker and by running the prebuilt models. ``` -docker pull zingg/zingg:0.3.2 -docker run -it zingg/zingg:0.3.2 bash +docker pull zingg/zingg:0.3.3 +docker run -it zingg/zingg:0.3.3 bash ./scripts/zingg.sh --phase match --conf examples/febrl/config.json ``` diff --git a/client/src/main/java/zingg/client/Client.java b/client/src/main/java/zingg/client/Client.java index 3e83e8261..b384d4642 100644 --- a/client/src/main/java/zingg/client/Client.java +++ b/client/src/main/java/zingg/client/Client.java @@ -94,7 +94,7 @@ else if (args.getJobId() != -1) { } public static void printBanner() { - String versionStr = "0.3.2"; + String versionStr = "0.3.3"; LOG.info(""); LOG.info("********************************************************"); LOG.info("* Zingg AI *"); diff --git a/docs/setup/installation.md b/docs/setup/installation.md index 7585fca45..9197d600c 100644 --- a/docs/setup/installation.md +++ b/docs/setup/installation.md @@ -7,8 +7,8 @@ nav_order: 3 ## Running from Docker image from Docker hub The easiest way to get started is pulling the Docker image with the last release of Zingg. ``` -docker pull zingg/zingg:0.3.2 -docker run -it zingg/zingg:0.3.2 bash +docker pull zingg/zingg:0.3.3 +docker run -it zingg/zingg:0.3.3 bash ``` Detailed help instructions for working with the Zingg docker image can be found [here](workingWithDocker.md). ## Installation @@ -54,13 +54,13 @@ If you have a ready Spark cluster, you can run Zingg by configuring the followin Download the tar zingg-version.tar.gz to a folder of your choice and run the following ->gzip -d zingg-0.3.2-SNAPSHOT-bin.tar.gz ; tar xvf zingg-0.3.2-SNAPSHOT-bin.tar +>gzip -d zingg-0.3.3-SNAPSHOT-bin.tar.gz ; tar xvf zingg-0.3.3-SNAPSHOT-bin.tar This will create a folder zingg-0.3.1-SNAPSHOT under the chosen folder. Move the above folder to zingg. ->mv zingg-0.3.2-SNAPSHOT-bin ~/zingg +>mv zingg-0.3.3-SNAPSHOT-bin ~/zingg >export ZINGG_HOME=path to zingg diff --git a/docs/setup/workingWithDocker.md b/docs/setup/workingWithDocker.md index c37870ae6..275409a22 100644 --- a/docs/setup/workingWithDocker.md +++ b/docs/setup/workingWithDocker.md @@ -2,14 +2,14 @@ # Working with Zingg docker image Running Zingg in Docker container is straightforward. Run following commands to get into the container. ``` -docker pull zingg/zingg:0.3.2 -docker run -it zingg/zingg:0.3.2 bash +docker pull zingg/zingg:0.3.3 +docker run -it zingg/zingg:0.3.3 bash ``` ## Sharing custom data and config files However, note that once docker container is stopped, all the work done in that session is lost. If we want to use custom data or persist the generated model or data files, we have to use **Volumes** or **Bind mount** to share files between the two. ``` -docker run -v : -it zingg/zingg:0.3.2 bash +docker run -v : -it zingg/zingg:0.3.3 bash ``` The **\** directory from host will get mounted inside container at **\**. Any file written inside this directory will persist on host machine and can be reused in new container instance later. @@ -26,7 +26,7 @@ A docker image is preferred to run with non-root user. By default, the zingg con ``` $ id uid=1000(abc) gid=1000(abc) groups=1000(abc) -$ docker run -u -it zingg/zingg:0.3.2 bash +$ docker run -u -it zingg/zingg:0.3.3 bash ``` ## Copying files To and From the Container diff --git a/pom.xml b/pom.xml index d220782a7..cdbebe790 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ - 0.3.2-SNAPSHOT + 0.3.3-SNAPSHOT true false 8 diff --git a/scripts/zingg.sh b/scripts/zingg.sh index dfdcdf588..079d78b36 100755 --- a/scripts/zingg.sh +++ b/scripts/zingg.sh @@ -1,6 +1,6 @@ #!/bin/bash #ZINGG_HOME=./assembly/target -ZINGG_JARS=$ZINGG_HOME/zingg-0.3.2-SNAPSHOT.jar +ZINGG_JARS=$ZINGG_HOME/zingg-0.3.3-SNAPSHOT.jar EMAIL=xxx@yyy.com LICENSE="test" ##for local