ciinabox-ecs 0.2.14.alpha.1565134498 → 0.2.17.alpha.1608078804

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e880b7dba8c1467738c20447f2c674653a5c07fba682096bb1b4a88c0ad0fc20
-  data.tar.gz: 0ef6400c28bf7ac39c28097397b43258c6b17dc27142e2a69a285119f94dff5e
+  metadata.gz: fe94e1bb46f1ef5e8709aff3b713546cd51db01c1476b8fef33d84df244da729
+  data.tar.gz: 429e3ea9cf8a5699d1a926a6019f705eb7ee526835bd20bddd51660ebc57afeb
 SHA512:
-  metadata.gz: 324fedec1ea455468cdf7129b9863911790ebc73fb3d7abc1bccd99032158326da723dd23233bb6dbf2939c3df04db8b1877664217cdba89dbf5dd8da01ac661
-  data.tar.gz: e611e774cce5d858f740917666e1f6694811e49effd4f9659f3b6c77f60ed911ec230475bf8ed4d61aa716541c60aaaffbf45afc590c21eccc3382fbf4352dc8
+  metadata.gz: 76888f39206c00d2351f7b4c9e17b38d8cb840deb1c4a5e9c60869c37bafd559f54ab474b3ac71897b1019f0589d8572691ef015b10b36d91585f4f3896a5467
+  data.tar.gz: 109ddb00b225e522773e41636007414531f681c8188b29c01a94d341b08603342230d1d2002ee80d8b9aa8e030b7f6928fcfaf01883058a790508969bc945e09

data/Rakefile

@@ -40,6 +40,8 @@ namespace :ciinabox do
     config = default_params
   end
 
+  config.merge!('current_dir'=>current_dir)
+
   Dir["#{ciinaboxes_dir}/#{ciinabox_name}/config/*.yml"].each {|config_file|
     if not config_file.include?('params.yml')
       config = config.merge(YAML.load(File.read(config_file)))

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

@@ -144,7 +144,7 @@ CloudFormation {
   if defined? enable_cloudwatch_agent and enable_cloudwatch_agent
     enable_cloudwatch_agent_userdata = [
       "mkdir -p /opt/aws/amazon-cloudwatch-agent/etc/\n",
-      "echo '#{File.open('config/files/amazon-cloudwatch-agent.json').read()}' > /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json\n",
+      "echo '#{File.open("#{config['current_dir']}/config/files/amazon-cloudwatch-agent.json").read()}' > /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json\n",
       "wget https://s3.amazonaws.com/amazoncloudwatch-agent/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm\n",
       "echo 'Installing CloudWatch agent...'\n",
       "rpm -U amazon-cloudwatch-agent.rpm\n",
@@ -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.14.alpha.1565134498
+  version: 0.2.17.alpha.1608078804
 platform: ruby
 authors:
 - Base2Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 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
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       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