This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.4
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.4 by this push:
new 1ba18b81c [Improve] docker-compose.yaml improvement
1ba18b81c is described below
commit 1ba18b81cbda4dc4639dcbc5bdcb285c25515dd4
Author: benjobs <[email protected]>
AuthorDate: Sun Apr 7 12:54:06 2024 +0800
[Improve] docker-compose.yaml improvement
---
docker/.env | 23 -----------------------
docker/config.yaml | 2 +-
docker/docker-compose.yaml | 10 +++++-----
3 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/docker/.env b/docker/.env
deleted file mode 100644
index 1f0af8f14..000000000
--- a/docker/.env
+++ /dev/null
@@ -1,23 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-SERVER_PORT=10000
-FLINK=flink1.14.5
-FLINK_IMAGE=flink:1.14.5-scala_2.12
-TZ=Asia/Shanghai
-RUN_COMMAND='/bin/sh -c "wget -P lib
https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.0.31/mysql-connector-j-8.0.31.jar
&& bash bin/streampark.sh start_docker "'
diff --git a/docker/config.yaml b/docker/config.yaml
index b2e0c385c..7e929ad49 100644
--- a/docker/config.yaml
+++ b/docker/config.yaml
@@ -20,7 +20,7 @@ logging:
root: info
server:
- port: ${SERVER_PORT}
+ port: 10000
session:
# The user's login session has a validity period. If it exceeds this time,
the user will be automatically logout
# unit: s|m|h|d, s: second, m:minute, h:hour, d: day
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 97e1cba09..dbd2d732c 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -18,13 +18,13 @@ version: '3.8'
services:
streampark-console:
image: apache/streampark:latest
- command: ${RUN_COMMAND}
+ command: '/bin/sh -c "wget -P lib
https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.0.31/mysql-connector-j-8.0.31.jar
&& bash bin/streampark.sh start_docker "'
ports:
- - ${SERVER_PORT}:${SERVER_PORT}
+ - "10000:10000"
env_file: .env
volumes:
- ./config.yaml:/streampark/conf/config.yaml
- - flink:/streampark/flink/${FLINK}
+ - flink:/streampark/flink/flink1.14.5
- /var/run/docker.sock:/var/run/docker.sock
- /etc/hosts:/etc/hosts:ro
- ~/.kube:/root/.kube:ro
@@ -34,7 +34,7 @@ services:
- streampark
flink-jobmanager:
- image: ${FLINK_IMAGE}
+ image: flink:1.14.5-scala_2.12
ports:
- "8081:8081"
command: jobmanager
@@ -47,7 +47,7 @@ services:
- streampark
flink-taskmanager:
- image: ${FLINK_IMAGE}
+ image: flink:1.14.5-scala_2.12
depends_on:
- flink-jobmanager
command: taskmanager
