Skip to content

Commit

Permalink
add tis docker-compose feather
Browse files Browse the repository at this point in the history
  • Loading branch information
baisui1981 committed Apr 9, 2024
1 parent 389a6c7 commit a083d78
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 36 deletions.
1 change: 1 addition & 0 deletions docker-compose/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data
35 changes: 19 additions & 16 deletions docker-compose/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
version: "1"
services:
# flink:
# image: registry.cn-hangzhou.aliyuncs.com/tis/flink:4.0.0.15
# hostname: flink
# environment:
# - FE_SERVERS=fe1:192.168.28.200:9010
# - FE_ID=1
# volumes:
# - /data/fe/doris-meta/:/opt/apache-doris/fe/doris-meta/
# - /data/fe/log/:/opt/apache-doris/fe/log/
# - ./fe.conf:/opt/apache-doris/fe/conf/fe.conf
# depends_on:
# - tis-console
flink:
image: registry.cn-hangzhou.aliyuncs.com/tis/flink:4.0.0
hostname: flink
mem_limit: 2048m
cpus: '1.0'
ports:
- "8081:8081"
command: ["/bin/bash","-c","./bin/start-cluster.sh && tail -f ./log/flink--standalonesession-0-*.log"]
environment:
- TZ=Asia/Shanghai
depends_on:
- tis-console
tis-console:
image: registry.cn-hangzhou.aliyuncs.com/tis/tis-console:4.0.0.15
image: registry.cn-hangzhou.aliyuncs.com/tis/tis-console:4.0.0
hostname: tis-console
mem_limit: "1.5G"
cpus: '2.5'
environment:
- TZ=Asia/Shanghai
- JAVA_JVM_OPTS=-Xms512m -Xmx1G -XX:MetaspaceSize=100m -XX:MaxMetaspaceSize=300m
ports:
- "8080:8080"
- "56432:56432"
# environment:
# - FE_SERVERS=fe1:192.168.28.200:9010
# - BE_ADDR=192.168.28.200:9050
volumes:
- ${PWD}/config/config.properties:/opt/app/tis-uber/tjs/conf/tis-web-config/config.properties
- ${PWD}/config/config.properties:/opt/app/tis-uber/tis-assemble/conf/tis-web-config/config.properties
- ${PWD}/data:/opt/data
- ${PWD}/data:/opt/data
25 changes: 25 additions & 0 deletions docker-compose/powerjob/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#build by https://github.com/PowerJob/PowerJob/blob/master/powerjob-server/docker/Dockerfile
FROM powerjob/powerjob-server:4.3.6 as origin



FROM eclipse-temurin:8-jre-jammy
ENV TZ=Asia/Shanghai


ENV APP_NAME=powerjob-server
# 传递 SpringBoot 启动参数 和 JVM参数
ENV PARAMS=""
ENV JVMOPTIONS=""
# 将应用 jar 包拷入 docker
COPY --from=origin /powerjob-server.jar /powerjob-server.jar
# 暴露端口(HTTP + AKKA + VertX)
EXPOSE 7700 10086 10010
# 创建 docker 文件目录(盲猜这是用户目录)
RUN mkdir -p /root/powerjob-server
# 挂载数据卷,将文件直接输出到宿主机(注意,此处挂载的是匿名卷,即在宿主机位置随机)
# VOLUME /root/powerjob
# 启动应用
ENTRYPOINT ["sh","-c","java $JVMOPTIONS -jar /powerjob-server.jar $PARAMS"]


2 changes: 2 additions & 0 deletions docker-compose/powerjob/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
docker build . -t registry.cn-hangzhou.aliyuncs.com/tis/powerjob-server:4.3.6
docker push registry.cn-hangzhou.aliyuncs.com/tis/powerjob-server:4.3.6
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,6 @@
@Public
public abstract class K8sImage implements Describable<K8sImage>, IdentityName {

// public static final String DEFAULT_DESC_NAME = "dft-image";
// public static final String DEFAULT_POWERJOB_DESC_NAME = "powerjob-image";

// /**
// * 获取Plugin存储器
// *
// * @param imageCategory
// * @return
// */
// public static IPluginStore getPluginStore(K8sImage.ImageCategory imageCategory) {
// UploadPluginMeta pluginMeta = UploadPluginMeta.parse(
// HeteroEnum.K8S_IMAGES.identity + ":" + UploadPluginMeta.KEY_REQUIRE + "," + KEY_TARGET_PLUGIN_DESC + ATTR_KEY_VALUE_SPLIT + imageCategory.token);
// return pluginMeta.getHeteroEnum().getPluginStore(null, pluginMeta);
// return imageCategory.getPluginStore();
// }


public static enum ImageCategory {
DEFAULT_DESC_NAME("dft-image", () -> HeteroEnum.K8S_DEFAULT_IMAGES.getPluginStore(null, null)) //
Expand Down Expand Up @@ -92,8 +76,12 @@ public static ImageCategory parse(String token) {

public abstract List<HostAlias> getHostAliases();

// public static class HostAliases extends ArrayList<HostAlias> {
// }
/**
* 内部网络是否可触达
*
* @return
*/
public abstract boolean internalClusterAvailable();

/**
* ParamsConfig.createConfigInstance(): io.kubernetes.client.openapi.ApiClient
Expand Down
4 changes: 2 additions & 2 deletions tis-web-config/config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ tis.datasource.type=derby
tis.datasource.dbname=tis_console_db


assemble.host=192.168.28.130
tis.host=192.168.28.130
assemble.host=192.168.28.131
tis.host=192.168.28.131



0 comments on commit a083d78

Please sign in to comment.