Skip to content

Commit 0b87a0d

Browse files
ShourenShouren
committed
feat: update deps for new image
1 parent ff80b35 commit 0b87a0d

File tree

3 files changed

+47
-41
lines changed

3 files changed

+47
-41
lines changed

‎docker/Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,26 @@
1414

1515
FROM ubuntu:22.04
1616

17-
ARG ZETASQL_VERSION=0.3.4
17+
ARG ZETASQL_VERSION=0.3.5
1818
ARG THIRDPARTY_VERSION=0.7.1
1919
ARG TARGETARCH
2020

21-
22-
LABEL org.opencontainers.image.source https://github.com/4paradigm/OpenMLDB
23-
21+
LABEL org.opencontainers.image.source=https://github.com/4paradigm/OpenMLDB
2422
COPY ./*.sh /
2523

2624
RUN apt update -y && \
27-
apt install -y build-essential python3-dev openjdk-11-jdk flex doxygen lcov git curl && \
2825
apt clean cache && \
29-
curl -Lo zookeeper.tar.gz https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz && \
26+
apt install -y build-essential libicu-dev python3-dev python3-pip openjdk-11-jdk flex doxygen lcov git curl && \
27+
apt clean cache && \
3028
mkdir -p /deps/src && \
29+
curl -Lo zookeeper.tar.gz https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz && \
3130
tar xf zookeeper.tar.gz -C /deps/src && \
3231
/setup_deps.sh -z "$ZETASQL_VERSION" -t "$THIRDPARTY_VERSION" && \
3332
rm -v /*.sh
3433

3534
ENV THIRD_PARTY_DIR=/deps/usr
3635
ENV THIRD_PARTY_SRC_DIR=/deps/src
37-
ENV LD_LIBRARY_PATH=/deps/usr/lib:/deps/usr/lib64:$LD_LIBRARY_PATH
36+
ENV LD_LIBRARY_PATH="/deps/usr/lib:/deps/usr/lib64"
3837
ENV LANG=en_US.UTF-8
3938
ENV ZETASQL_VERSION=$ZETASQL_VERSION
4039
ENV THIRDPARTY_VERSION=$THIRDPARTY_VERSION

‎docker/setup_deps.sh

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
1716
set -eE
1817

1918
INPUT=$(arch)
@@ -24,77 +23,85 @@ THIRDPARTY_VERSION=
2423
# NAME: usage
2524
# DESCRIPTION: Display usage information.
2625
#===============================================================================
27-
function usage ()
28-
{
29-
echo "Usage : $0 [options] [--]
26+
function usage() {
27+
echo "Usage : $0 [options] [--]
3028
3129
Options:
3230
-h Display this message
3331
-a Specify os architecture, default $(arch)
3432
-t hybridsql thirdparty version, required
3533
-z Specify zetasql version, required"
3634

37-
} # ---------- end of function usage ----------
35+
} # ---------- end of function usage ----------
3836

3937
#-----------------------------------------------------------------------
4038
# Handle command line arguments
4139
#-----------------------------------------------------------------------
4240

43-
while getopts ":ha:z:t:" opt
44-
do
41+
while getopts ":ha:z:t:" opt; do
4542
case $opt in
4643

47-
h) usage; exit 0 ;;
44+
h)
45+
usage
46+
exit 0
47+
;;
4848

49-
a) INPUT=$OPTARG ;;
49+
a) INPUT=$OPTARG ;;
5050

51-
t) THIRDPARTY_VERSION=$OPTARG ;;
51+
t) THIRDPARTY_VERSION=$OPTARG ;;
5252

53-
z) ZETASQL_VERSION=$OPTARG ;;
53+
z) ZETASQL_VERSION=$OPTARG ;;
5454

55-
*) echo -e "\n Option does not exist : $OPTARG\n"
56-
usage; exit 1 ;;
55+
*)
56+
echo -e "\n Option does not exist : $OPTARG\n"
57+
usage
58+
exit 1
59+
;;
5760

58-
esac # --- end of case ---
61+
esac # --- end of case ---
5962
done
60-
shift $((OPTIND-1))
63+
shift $((OPTIND - 1))
6164

6265
if [[ -z "$ZETASQL_VERSION" || -z "$THIRDPARTY_VERSION" ]]; then
63-
echo "ZETASQL_VERSION and THIRDPARTY_VERSION number required"
64-
exit 1
66+
echo "ZETASQL_VERSION and THIRDPARTY_VERSION number required"
67+
exit 1
6568
fi
6669

6770
if [[ $INPUT = 'i386' || $INPUT = 'x86_64' || $INPUT = 'amd64' ]]; then
68-
ARCH=x86_64
71+
ARCH=x86_64
6972
elif [[ $INPUT = 'aarch64' || $INPUT = 'arm64' ]]; then
70-
ARCH=aarch64
73+
ARCH=aarch64
7174
else
72-
echo "Unsupported arch: $INPUT"
73-
exit 1
75+
echo "Unsupported arch: $INPUT"
76+
exit 1
7477
fi
7578

7679
pushd "$(dirname "$0")"
7780

78-
curl -Lo cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.21.0/cmake-3.21.0-linux-"$ARCH".tar.gz && \
79-
echo "downloaded cmake.tar.gz for $ARCH"
81+
curl -Lo cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.21.0/cmake-3.21.0-linux-"$ARCH".tar.gz &&
82+
echo "downloaded cmake.tar.gz for $ARCH"
8083
tar xf cmake.tar.gz -C /usr/local/ --strip-components=1
8184
rm -v cmake.tar.gz
8285

8386
mkdir -p /deps/usr
8487

8588
if [[ "$ARCH" = "x86_64" ]]; then
86-
curl -Lo thirdparty.tar.gz "https://github.com/4paradigm/hybridsql-asserts/releases/download/v${THIRDPARTY_VERSION}/thirdparty-${THIRDPARTY_VERSION}-linux-gnu-x86_64-centos.tar.gz" && \
87-
echo "downloaded thirdparty.tar.gz version $THIRDPARTY_VERSION for $ARCH"
88-
curl -Lo zetasql.tar.gz "https://github.com/4paradigm/zetasql/releases/download/v${ZETASQL_VERSION}/libzetasql-${ZETASQL_VERSION}-linux-gnu-x86_64-centos.tar.gz" && \
89-
echo "downloaded zetasql.tar.gz version $ZETASQL_VERSION for $ARCH"
89+
# curl -Lo thirdparty.tar.gz "https://github.com/4paradigm/hybridsql-asserts/releases/download/v${THIRDPARTY_VERSION}/thirdparty-${THIRDPARTY_VERSION}-linux-gnu-x86_64-ubuntu.tar.gz" &&
90+
curl -Lo thirdparty.tar.gz "https://openmldb.ai/download/thirdparty/releases/download/v${THIRDPARTY_VERSION}/thirdparty-${THIRDPARTY_VERSION}-linux-gnu-${ARCH}-ubuntu.tar.gz" &&
91+
echo "downloaded thirdparty.tar.gz version $THIRDPARTY_VERSION for $ARCH"
92+
# curl -Lo zetasql.tar.gz "https://github.com/4paradigm/zetasql/releases/download/v${ZETASQL_VERSION}/libzetasql-${ZETASQL_VERSION}-linux-gnu-${ARCH}-ubuntu.tar.gz" &&
93+
curl -Lo zetasql.tar.gz "https://openmldb.ai/download/zetasql/releases/download/v${ZETASQL_VERSION}/ibzetasql-${ZETASQL_VERSION}-linux-gnu-${ARCH}-ubuntu.tar.gz" &&
94+
echo "downloaded zetasql.tar.gz version $ZETASQL_VERSION for $ARCH"
9095
elif [[ "$ARCH" = "aarch64" ]]; then
91-
curl -Lo thirdparty.tar.gz "https://github.com/4paradigm/hybridsql-asserts/releases/download/v${THIRDPARTY_VERSION}/thirdparty-${THIRDPARTY_VERSION}-linux-gnu-${ARCH}.tar.gz" && \
92-
echo "downloaded thirdparty.tar.gz version $THIRDPARTY_VERSION for $ARCH"
93-
curl -Lo zetasql.tar.gz "https://github.com/4paradigm/zetasql/releases/download/v${ZETASQL_VERSION}/libzetasql-${ZETASQL_VERSION}-linux-gnu-${ARCH}.tar.gz" && \
94-
echo "downloaded zetasql.tar.gz version $ZETASQL_VERSION for $ARCH"
96+
# curl -Lo thirdparty.tar.gz "https://github.com/4paradigm/hybridsql-asserts/releases/download/v${THIRDPARTY_VERSION}/thirdparty-${THIRDPARTY_VERSION}-linux-gnu-${ARCH}.tar.gz" &&
97+
curl -Lo thirdparty.tar.gz "https://openmldb.ai/download/thirdparty/releases/download/v${THIRDPARTY_VERSION}/thirdparty-${THIRDPARTY_VERSION}-linux-gnu-${ARCH}-ubuntu.tar.gz" &&
98+
echo "downloaded thirdparty.tar.gz version $THIRDPARTY_VERSION for $ARCH"
99+
# curl -Lo zetasql.tar.gz "https://github.com/4paradigm/zetasql/releases/download/v${ZETASQL_VERSION}/libzetasql-${ZETASQL_VERSION}-linux-gnu-${ARCH}.tar.gz" &&
100+
curl -Lo zetasql.tar.gz "https://openmldb.ai/download/zetasql/releases/download/v${ZETASQL_VERSION}/ibzetasql-${ZETASQL_VERSION}-linux-gnu-${ARCH}-ubuntu.tar.gz" &&
101+
echo "downloaded zetasql.tar.gz version $ZETASQL_VERSION for $ARCH"
95102
else
96-
echo "no pre-compiled deps for arch=$ARCH"
97-
exit 1
103+
echo "no pre-compiled deps for arch=$ARCH"
104+
exit 1
98105
fi
99106

100107
tar xf thirdparty.tar.gz -C /deps/usr --strip-components=1

‎third-party/cmake/FetchZetasql.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
set(ZETASQL_HOME https://github.com/4paradigm/zetasql)
16-
set(ZETASQL_VERSION 0.3.4)
16+
set(ZETASQL_VERSION 0.3.5)
1717
set(ZETASQL_HASH_DARWIN a8d18f1595fa6a78d09c5feca813e9a332cd4d156a95124165f7c1a1ebcb86b2)
1818
set(ZETASQL_HASH_LINUX_UBUNTU 11988ad45de027566386a8e832e7385755f9367d78243b8d2aa6ef3493c0ee3d)
1919
set(ZETASQL_HASH_LINUX_CENTOS 92c9eb4d1ffb7d96fcb33150366906c52f27db4cf8dfb442c06e5fe5c738cd4a)

0 commit comments

Comments
 (0)