Skip to content

Commit

Permalink
add nodeIP to env
Browse files Browse the repository at this point in the history
  • Loading branch information
timfeirg committed Nov 10, 2016
1 parent dbc2ac3 commit 6a68d22
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions cluster/calcium/create_container.go
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ func (c *calcium) makeContainerOptions(quota map[string]int, specs types.Specs,
// env
env := append(opts.Env, fmt.Sprintf("APP_NAME=%s", specs.Appname))
env = append(env, fmt.Sprintf("ERU_POD=%s", opts.Podname))
env = append(env, fmt.Sprintf("ERU_NODE_IP=%s", nodeIP))

// mount paths
// 先把mount_paths给挂载了, 没有的话生成俩空的返回去也好啊.
Expand Down
2 changes: 1 addition & 1 deletion make-rpm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ mv eru-core.service $SERVICE
VERSION=$(cat VERSION)
echo $VERSION rpm build begin

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

rm -rf $ROOT

0 comments on commit 6a68d22

Please sign in to comment.