Merge pull request #9 from apls777/dev

template fix
spotty-cloud · Sep 9, 2018 · 60f6b3b · 60f6b3b
2 parents b45f3d0 + c9e113a
commit 60f6b3b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/spotty/__init__.py b/spotty/__init__.py
@@ -1 +1 @@
-__version__ = '1.0.7'
+__version__ = '1.0.8'
diff --git a/spotty/data/create_ami.yaml b/spotty/data/create_ami.yaml
@@ -448,6 +448,6 @@ Outputs:
   NewAMI:
     Description: Created AMI ID
     Value: !Ref DeleteAMI
-  InstanceLogGroupName:
+  InstanceLogGroup:
     Description: CloudWatch log group name for the instance
     Value: !Ref InstanceLogGroup
diff --git a/spotty/data/run_container.yaml b/spotty/data/run_container.yaml
@@ -121,41 +121,41 @@ Resources:
             /tmp/cwlogs/logs.conf:
               content: !Sub |
                 [general]
-                state_file= /var/awslogs/agent-state
+                state_file = /var/awslogs/agent-state
 
                 [/var/log/cloud-init-output.log]
                 file = /var/log/cloud-init-output.log
-                log_group_name = ${SpotInstanceLogGroup}
+                log_group_name = ${InstanceLogGroup}
                 log_stream_name = {instance_id}/cloud-init-output.log
                 datetime_format = %d/%b/%Y:%H:%M:%S
 
                 [/var/log/cfn-init.log]
                 file = /var/log/cfn-init.log
-                log_group_name = ${SpotInstanceLogGroup}
+                log_group_name = ${InstanceLogGroup}
                 log_stream_name = {instance_id}/cfn-init.log
                 datetime_format = %d/%b/%Y:%H:%M:%S
 
                 [/var/log/cfn-init-cmd.log]
                 file = /var/log/cfn-init-cmd.log
-                log_group_name = ${SpotInstanceLogGroup}
+                log_group_name = ${InstanceLogGroup}
                 log_stream_name = {instance_id}/cfn-init-cmd.log
                 datetime_format = %d/%b/%Y:%H:%M:%S
 
                 [/var/log/cfn-hup.log]
                 file = /var/log/cfn-hup.log
-                log_group_name = ${SpotInstanceLogGroup}
+                log_group_name = ${InstanceLogGroup}
                 log_stream_name = {instance_id}/cfn-hup.log
                 datetime_format = %d/%b/%Y:%H:%M:%S
 
                 [/var/log/cfn-wire.log]
                 file = /var/log/cfn-wire.log
-                log_group_name = ${SpotInstanceLogGroup}
+                log_group_name = ${InstanceLogGroup}
                 log_stream_name = {instance_id}/cfn-wire.log
                 datetime_format = %d/%b/%Y:%H:%M:%S
 
                 [/var/log/docker-commands.log]
                 file = /var/log/docker-commands.log
-                log_group_name = ${SpotInstanceLogGroup}
+                log_group_name = ${InstanceLogGroup}
                 log_stream_name = {instance_id}/docker-commands.log
                 datetime_format = %d/%b/%Y:%H:%M:%S
               mode: '000400'
@@ -243,7 +243,9 @@ Resources:
                   service docker restart
 
                   # remove all containers
-                  docker rm $(docker ps -aq)
+                  if [[ $(docker ps -aq | wc -c) -ne 0 ]]; then
+                    docker rm $(docker ps -aq)
+                  fi
                 fi
 
                 # build docker image
@@ -299,7 +301,7 @@ Resources:
             run_container:
               command: /bin/bash -xe /tmp/scripts/run_container.sh
 
-  SpotInstanceLogGroup:
+  InstanceLogGroup:
     Type: AWS::Logs::LogGroup
     DeletionPolicy: Retain
     Properties:
@@ -548,4 +550,4 @@ Outputs:
   InstanceIpAddress:
     Value: !GetAtt SpotInstance.PublicIp
   InstanceLogGroup:
-    Value: !Ref SpotInstanceLogGroup
+    Value: !Ref InstanceLogGroup