Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use notebook latest version #22

Merged
merged 1 commit into from
Feb 28, 2022
Merged

use notebook latest version #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/bin/build-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ Usage: build-sandbox-image.sh
Arguments are specified with the following environment variable:
MLSQL_SPARK_VERSION - the spark version, 2.3/2.4/3.0 default 3.0
SPARK_VERSION - Spark full version, 2.4.3/3.1.1 default 3.1.1
BYZER_LANG_VERSION - Byzer-lang version default 2.2.1-SNAPSHOT
BYZER_NOTEBOOK_VERSION - byzer notebook version default 1.0.1-SNAPSHOT
BYZER_LANG_VERSION - Byzer-lang version default 2.3.0-SNAPSHOT
BYZER_NOTEBOOK_VERSION - byzer notebook version default 1.0.2-SNAPSHOT
MLSQL_TAG - mlsql git tag to checkout, no default value
EOF
exit 1
Expand Down
10 changes: 5 additions & 5 deletions dev/bin/build-sandbox-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@ set -u
set -e
set -o pipefail

self=$(cd "$(dirname $0)" && pwd)
source "${self}/mlsql-functions.sh"

function exit_with_usage {
cat << EOF
Usage: build-sandbox-image.sh
Arguments are specified with the following environment variable:
SPARK_VERSION - Spark full version, 2.4.3/3.1.1 default 3.1.1
BYZER_LANG_VERSION - Byzer-lang version default latest
BYZER_NOTEBOOK_VERSION - byzer notebook version default latest
BYZER_LANG_VERSION - Byzer-lang version default 2.3.0-SNAPSHOT
BYZER_NOTEBOOK_VERSION - byzer notebook version default 1.0.2-SNAPSHOT
MLSQL_TAG - mlsql git tag to checkout, no default value
EOF
exit 1
Expand All @@ -56,9 +59,6 @@ function build_image {
"${base_dir}"/dev
}

self=$(cd "$(dirname $0)" && pwd)
source "${self}/mlsql-functions.sh"

if [[ $@ == *"help"* ]]; then
exit_with_usage
fi
Expand Down
8 changes: 4 additions & 4 deletions dev/bin/docker-compose-up.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export MYSQL_PORT=${MYSQL_PORT:-3306}
export KOLO_LANG_PORT=${KOLO_LANG_PORT:-9003}
export BYZER_NOTEBOOK_PORT=${BYZER_NOTEBOOK_PORT:-9002}
export SPARK_VERSION=${SPARK_VERSION:-3.1.1}
export BYZER_LANG_VERSION=${BYZER_LANG_VERSION:-2.2.1-SNAPSHOT}
export BYZER_NOTEBOOK_VERSION=${BYZER_NOTEBOOK_VERSION:-1.0.1-SNAPSHOT}
export BYZER_LANG_VERSION=${BYZER_LANG_VERSION:-2.3.0-SNAPSHOT}
export BYZER_NOTEBOOK_VERSION=${BYZER_NOTEBOOK_VERSION:-1.0.2-SNAPSHOT}

function exit_with_usage() {
cat <<EOF
Expand All @@ -39,8 +39,8 @@ MYSQL_PORT - the mysql port default 3306
KOLO_LANG_PORT - the kolo-lang port default 9003
BYZER_NOTEBOOK_PORT - the byzer notebook port default 9002
SPARK_VERSION - the spark version, 2.4/3.0 default 3.0
BYZER_LANG_VERSION - Byzer-lang version default 2.2.1-SNAPSHOT
BYZER_NOTEBOOK_VERSION - byzer notebook version default 1.0.1-SNAPSHOT
BYZER_LANG_VERSION - Byzer-lang version default 2.3.0-SNAPSHOT
BYZER_NOTEBOOK_VERSION - byzer notebook version default 1.0.2-SNAPSHOT
EOF
exit 1
}
Expand Down
4 changes: 2 additions & 2 deletions dev/bin/mlsql-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ lib_path=${base_dir}/dev/lib

export SPARK_VERSION=${SPARK_VERSION:-3.1.1}

export MLSQL_CONSOLE_VERSION=${MLSQL_CONSOLE_VERSION:-2.2.1-SNAPSHOT}
export BYZER_NOTEBOOK_VERSION=${BYZER_NOTEBOOK_VERSION:-1.0.1-SNAPSHOT}
#export MLSQL_CONSOLE_VERSION=${MLSQL_CONSOLE_VERSION:-2.2.1-SNAPSHOT}
export BYZER_NOTEBOOK_VERSION=${BYZER_NOTEBOOK_VERSION:-1.0.2-SNAPSHOT}
export BYZER_NOTEBOOK_HOME=$byzer_notebook_path

if [[ ${SPARK_VERSION} == "2.4.3" ]]
Expand Down
4 changes: 2 additions & 2 deletions dev/docker/mlsql-sandbox/build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash

export SPARK_VERSION=${SPARK_VERSION:-3.1.1}
export BYZER_LANG_VERSION=${BYZER_LANG_VERSION:-2.2.0-SNAPSHOT}
export BYZER_NOTEBOOK_VERSION=${BYZER_NOTEBOOK_VERSION:-0.0.1-SNAPSHOT}
export BYZER_LANG_VERSION=${BYZER_LANG_VERSION:-2.3.0-SNAPSHOT}
export BYZER_NOTEBOOK_VERSION=${BYZER_NOTEBOOK_VERSION:-1.0.2-SNAPSHOT}
scala_version=2.12

docker build ./ \
Expand Down
10 changes: 5 additions & 5 deletions docs/multi-continer.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export MYSQL_PORT=3306
export KOLO_LANG_PORT=9003
export BYZER_NOTEBOOK_PORT=9002
export SPARK_VERSION=3.1.1
export BYZER_LANG_VERSION=2.2.1-SNAPSHOT
export BYZER_NOTEBOOK_VERSION=1.0.1-SNAPSHOT
export BYZER_LANG_VERSION=2.3.0-SNAPSHOT
export BYZER_NOTEBOOK_VERSION=1.0.2-SNAPSHOT
```

All the above parameters have default values, which are shown in the above parameters.
Expand All @@ -45,9 +45,9 @@ sh -x dev/bin/build-images.sh

```
# Set startup parameters
export BYZER_LANG_VERSION=${BYZER_LANG_VERSION:-2.2.1-SNAPSHOT}
export BYZER_LANG_VERSION=${BYZER_LANG_VERSION:-2.2.1-SNAPSHOT}
export BYZER_NOTEBOOK_VERSION=${BYZER_NOTEBOOK_VERSION:-1.0.1-SNAPSHOT}
export BYZER_LANG_VERSION=${BYZER_LANG_VERSION:-2.3.0-SNAPSHOT}
export BYZER_LANG_VERSION=${BYZER_LANG_VERSION:-2.3.0-SNAPSHOT}
export BYZER_NOTEBOOK_VERSION=${BYZER_NOTEBOOK_VERSION:-1.0.2-SNAPSHOT}
# Build image by specifying branch
export BYZER_NOTEBOOK_BRANCH=${BYZER_NOTEBOOK_BRANCH:-main}
# byzer lang branch, default branch is master
Expand Down
12 changes: 6 additions & 6 deletions docs/sandbox.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ There are some manual steps before building:
## For Spark 2.4.3 bundle
export MLSQL_SPARK_VERSION=2.4
export SPARK_VERSION=2.4.3
export BYZER_LANG_VERSION=2.2.1-SNAPSHOT
export BYZER_NOTEBOOK_VERSION=1.0.1-SNAPSHOT
export BYZER_LANG_VERSION=2.3.0-SNAPSHOT
export BYZER_NOTEBOOK_VERSION=1.0.2-SNAPSHOT
./dev/bin/build-sandbox-image.sh

## For Spark 3.1.1 bundle
export MLSQL_SPARK_VERSION=3.0
export SPARK_VERSION=3.1.1
export BYZER_LANG_VERSION=2.2.1-SNAPSHOT
export BYZER_NOTEBOOK_VERSION=1.0.1-SNAPSHOT
export BYZER_LANG_VERSION=2.3.0-SNAPSHOT
export BYZER_NOTEBOOK_VERSION=1.0.2-SNAPSHOT
./dev/bin/build-sandbox-image.sh

On the other hand, we support specifying git tag to build image:

## Build with tag
export MLSQL_SPARK_VERSION=3.0
export SPARK_VERSION=3.1.1
export BYZER_LANG_VERSION=2.2.1-SNAPSHOT
export BYZER_NOTEBOOK_VERSION=1.0.1-SNAPSHOT
export BYZER_LANG_VERSION=2.3.0-SNAPSHOT
export BYZER_NOTEBOOK_VERSION=1.0.2-SNAPSHOT
export MLSQL_TAG=v2.2.0
export BYZER_NOTEBOOK_TAG=v0.0.1-test
./dev/bin/build-sandbox-image.sh
Expand Down