Skip to content

Commit b624bb2

Browse files
author
cooperxiong
committed
[Feat] update starrocks
1 parent 23a8516 commit b624bb2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+5752
-1498
lines changed

Diff for: ‎bin/starrocks_build.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@ set -o pipefail
55
history_path=`pwd`
66
base_path=$(cd $(dirname $0)/..; pwd)
77
cd $base_path
8-
if [ ! -f "$base_path/contrib/starrocks/LICENSE" ];then
8+
if [ ! -f "$base_path/contrib/starrocks/LICENSE.txt" ];then
99
echo "fetch contrib submodule"
1010
git submodule update --init --recursive contrib/starrocks
1111
fi
1212
cd contrib/starrocks
13-
git checkout 3.1.1
13+
git clean -fd
14+
git reset --hard tags/3.1.11
1415
cd $base_path
1516
cp -rf $base_path/src/udf/starrocks/* $base_path/contrib/starrocks/
1617
echo "build starrocks in docker"
17-
DOCKER_BUILDKIT=1 docker build --rm=true --build-arg builder=starrocks/dev-env-ubuntu:3.1.1 -f docker/starrocks/build.Dockerfile -t artifacts-ubuntu:3.1.1 .
18+
DOCKER_BUILDKIT=1 docker build --rm=true --build-arg builder=starrocks/dev-env-ubuntu:3.1.11 -f docker/starrocks/build.Dockerfile -t artifacts-ubuntu:3.1.11 .
1819
echo "build starrocks success"
1920
echo "pack deploy docker"
2021
DOCKER_BUILDKIT=1 docker build -f docker/starrocks/deploy.Dockerfile -t fastcausalinference/starrocks-server:latest .

Diff for: ‎docker/starrocks/build.Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Please run this command from the git repo root directory to build:
33
#
44
# Build a Ubuntu based artifact image:
5-
# > DOCKER_BUILDKIT=1 docker build --rm=true --build-arg builder=starrocks/dev-env-ubuntu:3.1.1 -f docker/starrocks/dev.Dockerfile -t artifacts-ubuntu:3.1.1 .
5+
# > DOCKER_BUILDKIT=1 docker build --rm=true --build-arg builder=starrocks/dev-env-ubuntu:3.1.11 -f docker/starrocks/dev.Dockerfile -t artifacts-ubuntu:3.1.11 .
66

7-
FROM starrocks/dev-env-ubuntu:3.1.1 as fe-builder
7+
FROM starrocks/dev-env-ubuntu:3.1.11 as fe-builder
88
ARG BUILD_TYPE=Release
99
ARG MAVEN_OPTS="-Dmaven.artifact.threads=8"
1010

@@ -15,21 +15,21 @@ WORKDIR /build/starrocks
1515
RUN BUILD_TYPE=${BUILD_TYPE} MAVEN_OPTS=${MAVEN_OPTS} ./build.sh --fe --clean
1616

1717

18-
FROM starrocks/dev-env-ubuntu:3.1.1 as broker-builder
18+
FROM starrocks/dev-env-ubuntu:3.1.11 as broker-builder
1919
ARG MAVEN_OPTS
2020
COPY ./contrib/starrocks /build/starrocks
2121
WORKDIR /build/starrocks
2222
# clean and build Frontend and Spark Dpp application
2323
RUN cd fs_brokers/apache_hdfs_broker/ && MAVEN_OPTS=${MAVEN_OPTS} ./build.sh
2424

2525

26-
FROM starrocks/dev-env-ubuntu:3.1.1 as be-builder
26+
FROM starrocks/dev-env-ubuntu:3.1.11 as be-builder
2727
ARG MAVEN_OPTS
2828
# build Backend in different mode (build_type could be Release, DEBUG, or ASAN). Default value is Release.
2929
ARG BUILD_TYPE
3030
COPY ./contrib/starrocks /build/starrocks
3131
WORKDIR /build/starrocks
32-
RUN BUILD_TYPE=${BUILD_TYPE} MAVEN_OPTS=${MAVEN_OPTS} ./build.sh --be --clean -j6
32+
RUN BUILD_TYPE=${BUILD_TYPE} MAVEN_OPTS=${MAVEN_OPTS} ./build.sh --be --clean -j4
3333

3434
FROM busybox:latest
3535

Diff for: ‎docker/starrocks/conf/sources.list

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
deb http://mirrors.cloud.tencent.com/ubuntu/ jammy main restricted universe multiverse
2+
deb-src http://mirrors.cloud.tencent.com/ubuntu/ jammy main restricted universe multiverse
3+
deb http://mirrors.cloud.tencent.com/ubuntu/ jammy-security main restricted universe multiverse
4+
deb-src http://mirrors.cloud.tencent.com/ubuntu/ jammy-security main restricted universe multiverse
5+
deb http://mirrors.cloud.tencent.com/ubuntu/ jammy-updates main restricted universe multiverse
6+
deb-src http://mirrors.cloud.tencent.com/ubuntu/ jammy-updates main restricted universe multiverse
7+
deb http://mirrors.cloud.tencent.com/ubuntu/ jammy-proposed main restricted universe multiverse
8+
deb-src http://mirrors.cloud.tencent.com/ubuntu/ jammy-proposed main restricted universe multiverse
9+
deb http://mirrors.cloud.tencent.com/ubuntu/ jammy-backports main restricted universe multiverse
10+
deb-src http://mirrors.cloud.tencent.com/ubuntu/ jammy-backports main restricted universe multiverse

Diff for: ‎docker/starrocks/deploy.Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# Please run this command from the git repo root directory to build:
33
#
44
# - Use locally build artifacts to package runtime container:
5-
# > DOCKER_BUILDKIT=1 docker build --build-arg -f docker/starrocks/deploy.Dockerfile -t allin1-ubuntu:3.1.1 .
5+
# > DOCKER_BUILDKIT=1 docker build --build-arg -f docker/starrocks/deploy.Dockerfile -t allin1-ubuntu:3.1.11 .
66
#
77
# The artifact source used for packing the runtime docker image
88
# image: copy the artifacts from a artifact docker image.
99
# local: copy the artifacts from a local repo. Mainly used for local development and test.
1010

1111
# create a docker build stage that copy locally build artifacts
12-
FROM artifacts-ubuntu:3.1.1 as artifacts-from-local
12+
FROM artifacts-ubuntu:3.1.11 as artifacts-from-local
1313

1414

1515
FROM artifacts-from-local as artifacts
@@ -19,6 +19,7 @@ RUN rm -f /release/be_artifacts/be/lib/starrocks_be.debuginfo
1919
FROM ubuntu:22.04 as dependencies-installed
2020
ARG DEPLOYDIR=/data/deploy
2121
ENV SR_HOME=${DEPLOYDIR}/starrocks
22+
COPY docker/starrocks/conf/sources.list /etc/apt/sources.list
2223

2324
RUN apt-get update -y && apt-get install -y --no-install-recommends \
2425
binutils-dev default-jdk python2 mysql-client curl vim tree net-tools less tzdata linux-tools-common linux-tools-generic supervisor nginx netcat locales && \

0 commit comments

Comments
 (0)