Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mv Engine] Rename core to engine in config #970

Merged
merged 3 commits into from
May 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func New() (*Config, error) {
c.Log.Level = "info"
c.Log.ForceColors = false
c.Core.Image = "mesg/engine:" + strings.Split(version.Version, " ")[0]
c.Core.Name = "core"
c.Core.Name = "engine"
c.Core.Path = filepath.Join(home, ".mesg")
c.Core.Database.ServiceRelativePath = filepath.Join("database", "services", serviceDBVersion)
c.Core.Database.ExecutionRelativePath = filepath.Join("database", "executions", executionDBVersion)
Expand Down
2 changes: 1 addition & 1 deletion config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestDefaultValue(t *testing.T) {
require.Equal(t, filepath.Join(home, ".mesg"), c.Core.Path)
require.Equal(t, filepath.Join("database", "services", serviceDBVersion), c.Core.Database.ServiceRelativePath)
require.Equal(t, filepath.Join("database", "executions", executionDBVersion), c.Core.Database.ExecutionRelativePath)
require.Equal(t, "core", c.Core.Name)
require.Equal(t, "engine", c.Core.Name)
require.Equal(t, "/mesg", c.Docker.Core.Path)
require.Equal(t, "/var/run/docker.sock", c.Docker.Socket)
require.True(t, strings.HasPrefix(c.Core.Image, "mesg/engine:"))
Expand Down
2 changes: 1 addition & 1 deletion container/container_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func mockNew(m *mocks.CommonAPIClient) {
}
networkInspectArguments = []interface{}{
mock.Anything,
"core",
"engine",
types.NetworkInspectOptions{},
}
networkInspectResponse = types.NetworkResource{
Expand Down
2 changes: 1 addition & 1 deletion dev-core
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ docker build tmp-systemservices -t $MESG_SERVICE_SERVER
docker service create -d \
-p 8080:8080 \
--name $MESG_SERVICE_SERVER \
--network core \
--network engine \
$MESG_SERVICE_SERVER

echo "compile cli and core"
Expand Down