Skip to content

Commit

Permalink
remove amp-ui (#676)
Browse files Browse the repository at this point in the history
  • Loading branch information
freignat91 authored and subfuzion committed Jan 11, 2017
1 parent cc8e819 commit 921ebf5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 76 deletions.
38 changes: 0 additions & 38 deletions cmd/adm-server/servercore/infrastructure.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const (

const (
ampVersion = "latest"
uiVersion = "0.3.0"
influxDBVersion = "1.1.2"
kapacitorVersion = "1.1.2"
telegrafVersion = "1.1.1"
Expand All @@ -36,7 +35,6 @@ func getAMPInfrastructureStack(m *AMPInfraManager) *ampStack {
} else {
stack.addImage("amp", "appcelerator/amp:"+ampVersion)
}
stack.addImage("amp-ui", "appcelerator/amp-ui:"+uiVersion)
stack.addImage("elasticsearch", "appcelerator/elasticsearch-amp:"+elasticsearchVersion)
stack.addImage("grafana", "appcelerator/grafana-amp:"+grafanaVersion)
stack.addImage("haproxy", "appcelerator/haproxy:"+haproxyVersion)
Expand Down Expand Up @@ -141,42 +139,6 @@ func getAMPInfrastructureStack(m *AMPInfraManager) *ampStack {
},
"etcd")

//add amp-ui
stack.addService(m, "amp-ui", "amp-ui", 1,
&swarm.ServiceSpec{
Annotations: swarm.Annotations{
Labels: map[string]string{
"io.amp.role": amp.InfrastructureRole,
},
},
TaskTemplate: swarm.TaskSpec{
ContainerSpec: swarm.ContainerSpec{
Args: nil,
Env: nil,
Labels: map[string]string{
"io.amp.role": amp.InfrastructureRole,
},
Mounts: []mount.Mount{
{
Type: mount.TypeBind,
Source: "/var/run/docker.sock",
Target: "/var/run/docker.sock",
},
},
},
Placement: &swarm.Placement{
Constraints: []string{"node.role == manager"},
},
},
EndpointSpec: nil,
Networks: []swarm.NetworkAttachmentConfig{
{
Target: infraPrivateNetwork,
Aliases: []string{"amp-ui"},
},
},
})

//add nats
stack.addService(m, "nats", "nats", 1,
&swarm.ServiceSpec{
Expand Down
38 changes: 0 additions & 38 deletions cmd/amp/platform_infrastructure.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const (

const (
ampVersion = "latest"
uiVersion = "0.3.0"
influxDBVersion = "1.1.2"
kapacitorVersion = "1.1.2"
telegrafVersion = "1.1.1"
Expand All @@ -36,7 +35,6 @@ func getAMPInfrastructureStack(m *ampManager) *ampStack {
} else {
stack.addImage("amp", "appcelerator/amp:"+ampVersion)
}
stack.addImage("amp-ui", "appcelerator/amp-ui:"+uiVersion)
stack.addImage("elasticsearch", "appcelerator/elasticsearch-amp:"+elasticsearchVersion)
stack.addImage("grafana", "appcelerator/grafana-amp:"+grafanaVersion)
stack.addImage("haproxy", "appcelerator/haproxy:"+haproxyVersion)
Expand Down Expand Up @@ -141,42 +139,6 @@ func getAMPInfrastructureStack(m *ampManager) *ampStack {
},
"etcd")

//add amp-ui
stack.addService(m, "amp-ui", "amp-ui", 1,
&swarm.ServiceSpec{
Annotations: swarm.Annotations{
Labels: map[string]string{
"io.amp.role": amp.InfrastructureRole,
},
},
TaskTemplate: swarm.TaskSpec{
ContainerSpec: swarm.ContainerSpec{
Args: nil,
Env: nil,
Labels: map[string]string{
"io.amp.role": amp.InfrastructureRole,
},
Mounts: []mount.Mount{
{
Type: mount.TypeBind,
Source: "/var/run/docker.sock",
Target: "/var/run/docker.sock",
},
},
},
Placement: &swarm.Placement{
Constraints: []string{"node.role == manager"},
},
},
EndpointSpec: nil,
Networks: []swarm.NetworkAttachmentConfig{
{
Target: infraPrivateNetwork,
Aliases: []string{"amp-ui"},
},
},
})

//add nats
stack.addService(m, "nats", "nats", 1,
&swarm.ServiceSpec{
Expand Down

0 comments on commit 921ebf5

Please sign in to comment.