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

0.1.4 - bug fixes #143

Merged
merged 9 commits into from
Jun 22, 2017
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Watch the 90 second demo below to see mu in action!
Install latest version to /usr/local/bin (or for additional options, see [wiki](https://github.com/stelligent/mu/wiki/Installation)):

```bash
curl -s http://getmu.io/install.sh | sh
curl -s https://getmu.io/install.sh | sh
```

Assuming your project already has a Dockerfile, you can initialize your mu.yml file with: `mu init`. More details available in the [quickstart](https://github.com/stelligent/mu/wiki/Quickstart).
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.13
0.1.14
12 changes: 7 additions & 5 deletions common/stack.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,13 @@ func buildStackTags(tags map[string]string) []*cloudformation.Tag {
})

for key, value := range tags {
stackTags = append(stackTags,
&cloudformation.Tag{
Key: aws.String(fmt.Sprintf("mu:%s", key)),
Value: aws.String(value),
})
if value != "" {
stackTags = append(stackTags,
&cloudformation.Tag{
Key: aws.String(fmt.Sprintf("mu:%s", key)),
Value: aws.String(value),
})
}
}
return stackTags
}
Expand Down
2 changes: 1 addition & 1 deletion examples/elb-https/mu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
environments:
- name: env-with-elb-https
loadbalancer:
certificate: "arn:aws:acm:us-west-2:312340000000:certificate/973c1a2f-e1c6-4f65-8d43-0000000000"
certificate: "973c1a2f-e1c6-4f65-8d43-0000000000"

2 changes: 1 addition & 1 deletion glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions templates/assets.go

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions templates/assets/cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Parameters:
Default: ''
ElbCert:
Type: String
Description: The ARN for the certificate to use for ELB. Leave blank to disable HTTPS
Description: The identifier for the certificate to use for ELB. Leave blank to disable HTTPS
Default: ''
ConsulServerAutoScalingGroup:
Type: String
Expand Down Expand Up @@ -539,7 +539,7 @@ Resources:
- Type: forward
TargetGroupArn: !Ref EcsElbDefaultTargetGroup
Certificates:
- CertificateArn: !Ref ElbCert
- CertificateArn: !Sub "arn:aws:acm:${AWS::Region}:${AWS::AccountId}:certificate/${ElbCert}"
Port: '443'
Protocol: HTTPS
EcsElbDefaultTargetGroup:
Expand Down Expand Up @@ -619,7 +619,7 @@ Resources:
awslogs-stream-prefix: instance
Command:
- 'agent'
- !Sub '-datacenter=${AWS::Region}'
- !Sub "-datacenter=${AWS::Region}"
- '-retry-join-ec2-tag-key=aws:autoscaling:groupName'
- !Sub "-retry-join-ec2-tag-value=${ConsulServerAutoScalingGroup}"
- Name: registrator
Expand Down
2 changes: 1 addition & 1 deletion templates/assets/consul.yml
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ Resources:
- '-server'
- !Sub "-bootstrap-expect=${DesiredCapacity}"
- '-ui'
- !Sub '-datacenter=${AWS::Region}'
- !Sub "-datacenter=${AWS::Region}"
- '-retry-join-ec2-tag-key=aws:autoscaling:groupName'
- !Sub "-retry-join-ec2-tag-value=${ECSAutoScalingGroup}"
PortMappings:
Expand Down
2 changes: 1 addition & 1 deletion templates/assets/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Parameters:
ListenerRulePriority:
Type: Number
Description: The priority of the rule being added to the listener
Default: 1
Default: '1'
VpcId:
Type: String
Description: Name of the value to import for the VpcId
Expand Down
2 changes: 1 addition & 1 deletion wiki
Submodule wiki updated from 26f4cf to e6b732