Skip to content

Commit ea1785f

Browse files
committed
Merge branch 'minor/nodeIP' into 'master'
add nodeIP to env 应 @flex 要求加上 node ip 注意到非host模式下,如果不提供dns,容器的dns就是node ip @platform See merge request !25
2 parents dbc2ac3 + 6a68d22 commit ea1785f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

cluster/calcium/create_container.go

+1
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@ func (c *calcium) makeContainerOptions(quota map[string]int, specs types.Specs,
533533
// env
534534
env := append(opts.Env, fmt.Sprintf("APP_NAME=%s", specs.Appname))
535535
env = append(env, fmt.Sprintf("ERU_POD=%s", opts.Podname))
536+
env = append(env, fmt.Sprintf("ERU_NODE_IP=%s", nodeIP))
536537

537538
// mount paths
538539
// 先把mount_paths给挂载了, 没有的话生成俩空的返回去也好啊.

make-rpm

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ mv eru-core.service $SERVICE
1717
VERSION=$(cat VERSION)
1818
echo $VERSION rpm build begin
1919

20-
fpm -f -s dir -t rpm -n eru-core --epoch 0 -v $VERSION --iteration 1.el7 -C $ROOT -p $PWD --verbose --category 'Development/App' --description 'docker eru core' --url 'http://github.com/projecteru/eru-core' --license 'BSD' --no-rpm-sign usr etc
20+
fpm -f -s dir -t rpm -n eru-core --epoch 0 -v $VERSION --iteration 1.el7 -C $ROOT -p $PWD --verbose --category 'Development/App' --description 'docker eru core' --url 'http://gitlab.ricebook.net/platform/core/' --license 'BSD' --no-rpm-sign usr etc
2121

2222
rm -rf $ROOT

0 commit comments

Comments
 (0)