Merge pull request #325 from DTStack/feat_master_1.1_dazhi

Feat master 1.1 dazhi

Dockerfile

@@ -0,0 +1,59 @@
+FROM centos
+
+# 作者
+MAINTAINER dazhi <[email protected]>
+
+# 定义工作目录
+ENV WORK_PATH /usr/taier
+
+WORKDIR $WORK_PATH
+
+# 创建目录
+RUN mkdir /usr/local/java
+RUN mkdir /usr/local/java/jre
+RUN mkdir /data
+# 添加jre
+ADD docker/jre-8u202-linux-x64.tar.gz /usr/local/java/jre
+
+RUN ls /usr/local/java/jre
+ENV JAVA_HOME /usr/local/java/jre/jre1.8.0_202
+ENV PATH $JAVA_HOME/bin:$PATH
+
+# 创建对应的文件夹
+ENV TAIER_LIB $WORK_PATH/lib
+ENV TAIER_PLUGINLIBS $WORK_PATH/pluginLibs
+ENV TAIER_DATASOURCEX $WORK_PATH
+ENV TAIER_LOGS $WORK_PATH/logs
+ENV TAIER_BIN $WORK_PATH/bin
+ENV TAIER_CONF $WORK_PATH/conf
+ENV TAIER_RUN $WORK_PATH/run
+ENV MYSQL_ROOT root
+ENV MYSQL_ROOT_PASSWORD 123456
+ENV MYSQL_IP 127.0.0.1
+ENV MYSQL_PORT 3306
+ENV NODE_ZKADDRESS 127.0.0.1:2181
+
+RUN mkdir $TAIER_LIB && \
+mkdir $TAIER_PLUGINLIBS   && \
+mkdir $TAIER_LOGS   && \
+mkdir $TAIER_BIN   && \
+mkdir $TAIER_CONF && \
+mkdir $TAIER_RUN && \
+touch $TAIER_RUN/rdos.pid && \
+touch $TAIER_LOGS/rdos.stdout
+
+COPY lib $TAIER_LIB/
+COPY bin $TAIER_BIN/
+COPY conf $TAIER_CONF/
+COPY pluginLibs $TAIER_PLUGINLIBS/
+
+ADD datasourceX.tar.gz $TAIER_DATASOURCEX/
+ADD chunjun.tar.gz /data/
+
+# 修改配置文件
+CMD sed -i "s!jdbc.username=!jdbc.username=$MYSQL_ROOT!g" $WORK_PATH/conf/application.properties && \
+sed -i "s!jdbc.password=!jdbc.password=$MYSQL_ROOT_PASSWORD!g" $WORK_PATH/conf/application.properties && \
+sed -i "s!jdbc:mysql:\/\/127.0.0.1:3306!jdbc:mysql:\/\/$MYSQL_IP:$MYSQL_PORT!g" $WORK_PATH/conf/application.properties && \
+sed -i "s!nodeZkAddress=127.0.0.1:2181/taier!nodeZkAddress=$NODE_ZKADDRESS/taier!g" $WORK_PATH/conf/application.properties && \
+sed -i "s!server.port =!server.port =$PORT!g" $WORK_PATH/conf/application.properties && \
+./bin/base.sh start

bin/taier-docer.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# 获得根目录
+SH_FILE_PATH=$(cd `dirname $0`; pwd)
+TAIER_PATH=$(cd $SH_FILE_PATH; cd ../;pwd)
+BUILD_TARER_SH="mvn-build.sh"
+TAIER_WEB_PATH=$(cd $TAIER_PATH; cd taier-ui/;pwd)
+
+echo "当前文件路径:$SH_FILE_PATH"
+echo "taier路径:$TAIER_PATH"
+
+# 打包
+echo "开始taier打包"
+#.$TAIER_PATH/build/$BUILD_TARER_SH
+
+echo "开始taier-ui编译打包"
+cd $TAIER_WEB_PATH
+echo "当前执行路径:$TAIER_WEB_PATH"
+# 需要提前安装 yarn 环境
+
+yarn build
+echo "完成taier-ui编译打包"
+echo "完成taier打包"
+

conf/application.properties

@@ -1,4 +1,4 @@
-nodeZkAddress=
+nodeZkAddress=127.0.0.1:2181/taier
 
 ################### DataSource Configuration ##########################
 jdbc.driverClassName=com.mysql.jdbc.Driver
@@ -10,4 +10,4 @@ server.tomcat.uri-encoding = UTF-8
 server.port = 8090
 server.tomcat.basedir = ./tmpSave
 
-datasource.plugin.path= /opt/dtstack/DTCommon/InsightPlugin/dataSourcePlugin
+datasource.plugin.path= /usr/taier/datasourceX

docker-compose.yml

@@ -0,0 +1,24 @@
+version: '3'
+services:
+  taier-db:
+    image: dtopensource/taier-mysql:1.0
+#    ports:
+#      - 3306:3306
+    environment:
+      MYSQL_DATABASE: taier
+      MYSQL_ROOT_PASSWORD: 123456
+  taier-zk:
+    image: zookeeper:3.4.9
+  taier-ui:
+    image: dtopensource/taier-ui:1.0
+    ports:
+      - 80:80
+    environment:
+      TAIER_IP: taier
+  taier:
+    image: dtopensource/taier:1.0
+#    ports:
+#      - 8090:8090
+    environment:
+      NODE_ZKADDRESS: taier-zk
+      MYSQL_IP: taier-db

docker/mysql/Dockerfile

@@ -0,0 +1,27 @@
+# 构建mysql 从5.7.37 版本开始
+FROM mysql:5.7.37-oracle
+
+# 作者
+MAINTAINER dazhi <[email protected]>
+
+# 定义会被容器自动执行的目录
+ENV AUTO_RUN_DIR /docker-entrypoint-initdb.d
+
+#### 执行sql ####
+# 定义要执行的sql文件名
+ENV CREATE_SQL_FILE sql/create.sql
+ENV INSERT_SQL_FILE sql/insert.sql
+
+# 配置mysql
+ENV MYSQL_DATABASE=taier
+ENV MYSQL_ROOT_PASSWORD 123456
+
+# 设置mysql的编码
+COPY utf8mb4.cnf /etc/mysql/conf.d/utf8mb4.cnf
+
+# 把sql文件复制到工作目录下和初始化脚本
+COPY $CREATE_SQL_FILE $AUTO_RUN_DIR/
+COPY $INSERT_SQL_FILE $AUTO_RUN_DIR/
+
+# 给执行文件增加可执行权限
+RUN chmod a+x $AUTO_RUN_DIR/$CREATE_DATA_SHELL