Skip to content

Commit 04ab6ae

Browse files
authored
Merge pull request #325 from DTStack/feat_master_1.1_dazhi
Feat master 1.1 dazhi
2 parents 836ac74 + d147715 commit 04ab6ae

Some content is hidden

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

48 files changed

+9431
-6839
lines changed

Dockerfile

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
FROM centos
2+
3+
# 作者
4+
MAINTAINER dazhi <[email protected]>
5+
6+
# 定义工作目录
7+
ENV WORK_PATH /usr/taier
8+
9+
WORKDIR $WORK_PATH
10+
11+
# 创建目录
12+
RUN mkdir /usr/local/java
13+
RUN mkdir /usr/local/java/jre
14+
RUN mkdir /data
15+
# 添加jre
16+
ADD docker/jre-8u202-linux-x64.tar.gz /usr/local/java/jre
17+
18+
RUN ls /usr/local/java/jre
19+
ENV JAVA_HOME /usr/local/java/jre/jre1.8.0_202
20+
ENV PATH $JAVA_HOME/bin:$PATH
21+
22+
# 创建对应的文件夹
23+
ENV TAIER_LIB $WORK_PATH/lib
24+
ENV TAIER_PLUGINLIBS $WORK_PATH/pluginLibs
25+
ENV TAIER_DATASOURCEX $WORK_PATH
26+
ENV TAIER_LOGS $WORK_PATH/logs
27+
ENV TAIER_BIN $WORK_PATH/bin
28+
ENV TAIER_CONF $WORK_PATH/conf
29+
ENV TAIER_RUN $WORK_PATH/run
30+
ENV MYSQL_ROOT root
31+
ENV MYSQL_ROOT_PASSWORD 123456
32+
ENV MYSQL_IP 127.0.0.1
33+
ENV MYSQL_PORT 3306
34+
ENV NODE_ZKADDRESS 127.0.0.1:2181
35+
36+
RUN mkdir $TAIER_LIB && \
37+
mkdir $TAIER_PLUGINLIBS && \
38+
mkdir $TAIER_LOGS && \
39+
mkdir $TAIER_BIN && \
40+
mkdir $TAIER_CONF && \
41+
mkdir $TAIER_RUN && \
42+
touch $TAIER_RUN/rdos.pid && \
43+
touch $TAIER_LOGS/rdos.stdout
44+
45+
COPY lib $TAIER_LIB/
46+
COPY bin $TAIER_BIN/
47+
COPY conf $TAIER_CONF/
48+
COPY pluginLibs $TAIER_PLUGINLIBS/
49+
50+
ADD datasourceX.tar.gz $TAIER_DATASOURCEX/
51+
ADD chunjun.tar.gz /data/
52+
53+
# 修改配置文件
54+
CMD sed -i "s!jdbc.username=!jdbc.username=$MYSQL_ROOT!g" $WORK_PATH/conf/application.properties && \
55+
sed -i "s!jdbc.password=!jdbc.password=$MYSQL_ROOT_PASSWORD!g" $WORK_PATH/conf/application.properties && \
56+
sed -i "s!jdbc:mysql:\/\/127.0.0.1:3306!jdbc:mysql:\/\/$MYSQL_IP:$MYSQL_PORT!g" $WORK_PATH/conf/application.properties && \
57+
sed -i "s!nodeZkAddress=127.0.0.1:2181/taier!nodeZkAddress=$NODE_ZKADDRESS/taier!g" $WORK_PATH/conf/application.properties && \
58+
sed -i "s!server.port =!server.port =$PORT!g" $WORK_PATH/conf/application.properties && \
59+
./bin/base.sh start

bin/taier-docer.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
3+
# 获得根目录
4+
SH_FILE_PATH=$(cd `dirname $0`; pwd)
5+
TAIER_PATH=$(cd $SH_FILE_PATH; cd ../;pwd)
6+
BUILD_TARER_SH="mvn-build.sh"
7+
TAIER_WEB_PATH=$(cd $TAIER_PATH; cd taier-ui/;pwd)
8+
9+
echo "当前文件路径:$SH_FILE_PATH"
10+
echo "taier路径:$TAIER_PATH"
11+
12+
# 打包
13+
echo "开始taier打包"
14+
#.$TAIER_PATH/build/$BUILD_TARER_SH
15+
16+
echo "开始taier-ui编译打包"
17+
cd $TAIER_WEB_PATH
18+
echo "当前执行路径:$TAIER_WEB_PATH"
19+
# 需要提前安装 yarn 环境
20+
21+
yarn build
22+
echo "完成taier-ui编译打包"
23+
echo "完成taier打包"
24+

conf/application.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
nodeZkAddress=
1+
nodeZkAddress=127.0.0.1:2181/taier
22

33
################### DataSource Configuration ##########################
44
jdbc.driverClassName=com.mysql.jdbc.Driver
@@ -10,4 +10,4 @@ server.tomcat.uri-encoding = UTF-8
1010
server.port = 8090
1111
server.tomcat.basedir = ./tmpSave
1212

13-
datasource.plugin.path= /opt/dtstack/DTCommon/InsightPlugin/dataSourcePlugin
13+
datasource.plugin.path= /usr/taier/datasourceX

docker-compose.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
version: '3'
2+
services:
3+
taier-db:
4+
image: dtopensource/taier-mysql:1.0
5+
# ports:
6+
# - 3306:3306
7+
environment:
8+
MYSQL_DATABASE: taier
9+
MYSQL_ROOT_PASSWORD: 123456
10+
taier-zk:
11+
image: zookeeper:3.4.9
12+
taier-ui:
13+
image: dtopensource/taier-ui:1.0
14+
ports:
15+
- 80:80
16+
environment:
17+
TAIER_IP: taier
18+
taier:
19+
image: dtopensource/taier:1.0
20+
# ports:
21+
# - 8090:8090
22+
environment:
23+
NODE_ZKADDRESS: taier-zk
24+
MYSQL_IP: taier-db

docker/jre-8u202-linux-x64.tar.gz

82.9 MB
Binary file not shown.

docker/mysql/Dockerfile

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# 构建mysql 从5.7.37 版本开始
2+
FROM mysql:5.7.37-oracle
3+
4+
# 作者
5+
MAINTAINER dazhi <[email protected]>
6+
7+
# 定义会被容器自动执行的目录
8+
ENV AUTO_RUN_DIR /docker-entrypoint-initdb.d
9+
10+
#### 执行sql ####
11+
# 定义要执行的sql文件名
12+
ENV CREATE_SQL_FILE sql/create.sql
13+
ENV INSERT_SQL_FILE sql/insert.sql
14+
15+
# 配置mysql
16+
ENV MYSQL_DATABASE=taier
17+
ENV MYSQL_ROOT_PASSWORD 123456
18+
19+
# 设置mysql的编码
20+
COPY utf8mb4.cnf /etc/mysql/conf.d/utf8mb4.cnf
21+
22+
# 把sql文件复制到工作目录下和初始化脚本
23+
COPY $CREATE_SQL_FILE $AUTO_RUN_DIR/
24+
COPY $INSERT_SQL_FILE $AUTO_RUN_DIR/
25+
26+
# 给执行文件增加可执行权限
27+
RUN chmod a+x $AUTO_RUN_DIR/$CREATE_DATA_SHELL

0 commit comments

Comments
 (0)