Merge pull request #85 from spotty-cloud/dev

Spotty 1.3.1

spotty/__init__.py

@@ -1 +1 @@
-__version__ = '1.3.0'
+__version__ = '1.3.1'

spotty/config/validation.py

@@ -148,7 +148,7 @@ def get_instance_parameters_schema(instance_parameters: dict, default_volume_typ
             Optional('localSshPort', default=None): Or(None, And(int, lambda x: 0 < x < 65536)),
             Optional('commands', default=''): str,
         },
-        And(lambda x: not x['dockerDataRoot'] or any([True for v in x['volumes'] if v['parameters']['mountDir'] and
+        And(lambda x: not x['dockerDataRoot'] or any([True for v in x['volumes'] if v['parameters'].get('mountDir') and
                                                       is_subdir(x['dockerDataRoot'], v['parameters']['mountDir'])]),
             error='The "mountDir" of one of the volumes must be a prefix for the "dockerDataRoot" path.'),
         *instance_checks

spotty/providers/aws/cfn_templates/instance/data/startup_scripts/02_mount_volumes.sh

@@ -13,7 +13,7 @@ do
 
   # NVMe EBS volume (see: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html)
   if [ ! -b $DEVICE ]; then
-    VOLUME_ID=$(cfn-get-metadata --stack spotty-instance-my-project-i1 --region us-east-2 --resource VolumeAttachment${!DEVICE_LETTERS[$i]^} -k VolumeId)
+    VOLUME_ID=$(cfn-get-metadata --stack ${AWS::StackName} --region us-east-2 --resource VolumeAttachment${!DEVICE_LETTERS[$i]^} -k VolumeId)
     DEVICE=$(lsblk -o NAME,SERIAL -dpJ | jq -rc ".blockdevices[] | select(.serial == \"${!VOLUME_ID//-}\") | .name")
     if [ -z "$DEVICE" ]; then
       echo "Device for the volume $VOLUME_ID not found"