Commit 7eecfe45 authored by liwenhe1993's avatar liwenhe1993
Browse files

Modify docker-compose and kubernetes config 

1. Move kubernetes to docker directory
2. Change docker-compose directory's name, and move docker-compose to docker directory
3. Modify docker-compose config and kubernetes config
4. Modify startup.sh in dockerfile
parent f1d8c151

docker-compose/docker-compose.yml→docker/docker-swarm/docker-compose.yml

+12 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



version: "3"

version: "3.4"



networks:

  dolphinscheduler-postgresql:
@@ -41,7 +41,10 @@ volumes: 
  dolphinscheduler-master:

  dolphinscheduler-worker-data:

  dolphinscheduler-worker-logs:



configs:

  dolphinscheduler-worker-task-env:

    file: ./dolphinscheduler_env.sh



services:
@@ -136,6 +139,7 @@ services: 
    volumes:

    - dolphinscheduler-frontend:/var/log/nginx

    networks:

    - dolphinscheduler-frontend

    - dolphinscheduler-api



  dolphinscheduler-alert:
@@ -210,6 +214,7 @@ services: 
    volumes: 

    - dolphinscheduler-master:/opt/dolphinscheduler/logs

    networks:

    - dolphinscheduler-master

    - dolphinscheduler-postgresql

    - dolphinscheduler-zookeeper
@@ -247,7 +252,10 @@ services: 
    volumes: 

    - dolphinscheduler-worker-data:/tmp/dolphinscheduler

    - dolphinscheduler-worker-logs:/opt/dolphinscheduler/logs

    - dolphinscheduler-worker-task-env:/opt/dolphinscheduler/conf/env/

    configs:

    - source: dolphinscheduler-worker-task-env

      target: /opt/dolphinscheduler/conf/env/dolphinscheduler_env.sh

    networks:

    - dolphinscheduler-worker

    - dolphinscheduler-postgresql

    - dolphinscheduler-zookeeper
 
 No newline at end of file

docker/docker-swarm/dolphinscheduler_env.sh

0 → 100644
+26 −0
Original line number Diff line number Diff line 
#

# 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.

#



export HADOOP_HOME=/opt/soft/hadoop

export HADOOP_CONF_DIR=/opt/soft/hadoop/etc/hadoop

export SPARK_HOME1=/opt/soft/spark1

export SPARK_HOME2=/opt/soft/spark2

export PYTHON_HOME=/opt/soft/python

export JAVA_HOME=/opt/soft/java

export HIVE_HOME=/opt/soft/hive

export FLINK_HOME=/opt/soft/flink

export PATH=$HADOOP_HOME/bin:$SPARK_HOME1/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$FLINK_HOME/bin:$PATH
 
 No newline at end of file