Skip to content

Commit

Permalink
Merge pull request #174 from navinrathore/zRelease
Browse files Browse the repository at this point in the history
0.3.3 release
  • Loading branch information
sonalgoyal committed Mar 19, 2022
2 parents 05006f9 + a7952fc commit 124a88e
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
10 changes: 5 additions & 5 deletions 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

4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/zingg/client/Client.java
Expand Up @@ -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 *");
Expand Down
8 changes: 4 additions & 4 deletions docs/setup/installation.md
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docs/setup/workingWithDocker.md
Expand Up @@ -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 <local-location>:<container-location> -it zingg/zingg:0.3.2 bash
docker run -v <local-location>:<container-location> -it zingg/zingg:0.3.3 bash
```
The **\<local-location\>** directory from host will get mounted inside container at **\<container-location\>**. Any file written inside this directory will persist on host machine and can be reused in new container instance later.

Expand All @@ -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 <uid> -it zingg/zingg:0.3.2 bash
$ docker run -u <uid> -it zingg/zingg:0.3.3 bash
```

## Copying files To and From the Container
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -84,7 +84,7 @@
</profile>
</profiles>
<properties>
<zingg.version>0.3.2-SNAPSHOT</zingg.version>
<zingg.version>0.3.3-SNAPSHOT</zingg.version>
<skipTests>true</skipTests>
<failIfNoTests>false</failIfNoTests>
<maven.compiler.source>8</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down

0 comments on commit 124a88e

Please sign in to comment.