Skip to content

Commit

Permalink
Remove hard coded ballista versions. Fixes #32
Browse files Browse the repository at this point in the history
  • Loading branch information
msathis committed Apr 24, 2021
1 parent 3cb83fe commit 4a99347
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 7 deletions.
3 changes: 1 addition & 2 deletions benchmarks/tpch-gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
# specific language governing permissions and limitations
# under the License.

BALLISTA_VERSION=0.5.0-SNAPSHOT

#set -e

. ./dev/build-set-env.sh
docker build -t ballistacompute/ballista-tpchgen:$BALLISTA_VERSION -f tpchgen.dockerfile .

# Generate data into the ./data directory if it does not already exist
Expand Down
3 changes: 2 additions & 1 deletion dev/build-rust-base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
BALLISTA_VERSION=0.5.0-SNAPSHOT
set -e

. ./dev/build-set-env.sh
docker build -t ballistacompute/rust-base:$BALLISTA_VERSION -f dev/docker/rust-base.dockerfile .
3 changes: 1 addition & 2 deletions dev/build-rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
# specific language governing permissions and limitations
# under the License.

BALLISTA_VERSION=0.5.0-SNAPSHOT

set -e

. ./dev/build-set-env.sh
docker build -t ballistacompute/ballista-rust:$BALLISTA_VERSION -f dev/docker/rust.dockerfile .
20 changes: 20 additions & 0 deletions dev/build-set-env.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

export BALLISTA_VERSION=$(awk -F'[ ="]+' '$1 == "version" { print $2 }' ballista/rust/core/Cargo.toml)
3 changes: 1 addition & 2 deletions dev/build-ui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
# specific language governing permissions and limitations
# under the License.

BALLISTA_VERSION=0.4.2-SNAPSHOT

set -e

. ./dev/build-set-env.sh
docker build -t ballistacompute/ballista-scheduler-ui:$BALLISTA_VERSION -f dev/docker/ui.scheduler.dockerfile ballista/ui/scheduler

0 comments on commit 4a99347

Please sign in to comment.