ciinabox-ecs 0.2.16 → 0.2.17.alpha.1608078804

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 762833bf59511dab5a6a489e75c647974d008e42e3aee77344782b150faf5b79
-  data.tar.gz: f7d12b259f8abb60017ff5b4d1a51f93fde95beb11052e37d7119a34bcf1cf2c
+  metadata.gz: fe94e1bb46f1ef5e8709aff3b713546cd51db01c1476b8fef33d84df244da729
+  data.tar.gz: 429e3ea9cf8a5699d1a926a6019f705eb7ee526835bd20bddd51660ebc57afeb
 SHA512:
-  metadata.gz: 2c4f5b4173f2abf1c118eaba246f7f0eedbbcd3b579058e65ee355c726483c938324a869e3b9268a4fc59ca446d05a08a40c8cb2c9f71e6ceb4f1cff23e51d81
-  data.tar.gz: d237c3a043b066f4d0c6a009232f2c348a1b6a91d0f0db9fed005480615dfd7be22fe35ec6b66cb9d81bb72efeae0a58b984222f5b7f063131442b756c63372e
+  metadata.gz: 76888f39206c00d2351f7b4c9e17b38d8cb840deb1c4a5e9c60869c37bafd559f54ab474b3ac71897b1019f0589d8572691ef015b10b36d91585f4f3896a5467
+  data.tar.gz: 109ddb00b225e522773e41636007414531f681c8188b29c01a94d341b08603342230d1d2002ee80d8b9aa8e030b7f6928fcfaf01883058a790508969bc945e09

data/config/ciinabox_params.yml.erb

@@ -57,6 +57,9 @@ ciinabox_iam_role_name: <%= ciinabox_iam_role_name %>
 #set the size of the ecs data volume -- NOTE: would take a new volume - i.e. change volume name
 #ecs_data_volume_size: 250
 
+#set the spot price for the ECS instance -- NOTE: The default value below is the on-demand price for a t2.large
+#ecs_instance_spot_price: 0.1168
+
 #optional ciinabox name if you need more than one or you want a different name
 #stack_name: ciinabox-tools
 

data/lambdas/acm_issuer_validator/lib/install.sh

@@ -5,7 +5,7 @@ cd $DIR/..
 rm -rf lib
 
 function pipinstall () {
-   if [ $(which pip) == '' ]; then
+   if [[ $(which pip) == '' ]]; then
         echo "ERROR! No pip installed. Try installing either python3 pip or docker"
         exit -1
    fi
@@ -13,7 +13,7 @@ function pipinstall () {
    pip install aws-acm-cert-validator==0.1.11 -t lib
 }
 
-if [ $(which docker) == '' ]; then
+if [[ $(which docker) == '' ]]; then
     pipinstall
 else
     docker run --rm -v $DIR/..:/dst -w /dst -u $UID python:3.6-alpine pip install aws-acm-cert-validator==0.1.11 -t lib

data/templates/ecs-cluster.rb

@@ -181,6 +181,9 @@ CloudFormation {
     if not ecs_block_device_mapping.empty?
       Property("BlockDeviceMappings", ecs_block_device_mapping)
     end
+    if defined? ecs_instance_spot_price
+      SpotPrice ecs_instance_spot_price
+    end
     UserData FnBase64(FnJoin("", [
         "#!/bin/bash\n",
         "echo ECS_CLUSTER=", Ref('ECSCluster'), " >> /etc/ecs/ecs.config\n",
@@ -190,10 +193,9 @@ CloudFormation {
         "hostname ciinabox-ecs-xx\n",
         "#{proxy_config_userdata}",
         "yum install -y python-pip\n",
-        "python-pip install --upgrade awscli\n",
-        "/usr/local/bin/aws --region ", Ref("AWS::Region"), " ec2 attach-volume --volume-id ", Ref(volume_name), " --instance-id ${INSTANCE_ID} --device /dev/sdf\n",
+        "aws --region ", Ref("AWS::Region"), " ec2 attach-volume --volume-id ", Ref(volume_name), " --instance-id ${INSTANCE_ID} --device /dev/sdf\n",
         "echo 'waiting for ECS Data volume to attach' && sleep 20\n",
-        "/usr/local/bin/aws --region ", Ref("AWS::Region"), " ec2 attach-network-interface --network-interface-id ",  Ref('ECSENI'), " --instance-id ${INSTANCE_ID} --device-index 1\n",
+        "aws --region ", Ref("AWS::Region"), " ec2 attach-network-interface --network-interface-id ",  Ref('ECSENI'), " --instance-id ${INSTANCE_ID} --device-index 1\n",
         "echo 'waiting for ECS ENI to attach' && sleep 20\n",
         "echo '/dev/xvdf   /data        ext4    defaults,nofail 0   2' >> /etc/fstab\n",
         "mkdir -p /data\n",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciinabox-ecs
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17.alpha.1608078804
 platform: ruby
 authors:
 - Base2Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,16 +56,16 @@ dependencies:
   name: cfndsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: cfn_manage
   requirement: !ruby/object:Gem::Requirement
@@ -164,11 +164,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.2.1
 signing_key: 
 specification_version: 4
 summary: Manage ciinabox on Aws Ecs