ciinabox-ecs 0.2.15 → 0.3.0.alpha.1612323213

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a88f75f5dda20f0aaacdcacf2bec1bf14e77b8cdc13b908b6e5be27cdd84931
-  data.tar.gz: c2f27fe18ab6635a5e47b3f0089038c4a20217d0ab2c3d72bee930d5f32505b3
+  metadata.gz: d200cab46127553027d989b8d951cbff06f1654f255d17ce7949aa37e019c2bc
+  data.tar.gz: 6ba4f9c80cb8f01b33b882484382f157fb7457b8b7c5f73a32ac556339ac8faa
 SHA512:
-  metadata.gz: 77ae4ba25ddb44ccfbc404354c0b5ff4ea68c41ef9f76527df3c999684a485136bb7b81cd7401e49e624a273f5d0d8afa80518e65a80384c23a5d54cf6466b8e
-  data.tar.gz: c076b2cd5b69ef7fcf179d58c77caaa863020a08ab569fa23e9cb61a33f769fbed426c47f87a2e6e84dacbd12d23baf1f2eaec36b9ea73de3f173fd0b9cde73a
+  metadata.gz: b6dd6406339029c375018d69c903d85e113bfabac3935b7aecfbe871333af93f51668dc918615eb15acc483f3e2cb38097f3fd43791147276fa1577a7945ad18
+  data.tar.gz: 741b8b329b8362a1f83c2addc1701a420a53fd5fb1da2140bf4535d8c3cea1b13a9cf151f798cc203878dc611839b5c940aa80b062d6727f786b11188d512b18

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",

data/templates/ecs-services.rb

@@ -285,7 +285,7 @@ CloudFormation {
             Name: 'proxy',
             Memory: 256,
             Cpu: 100,
-            Image: 'jwilder/nginx-proxy',
+            Image: 'ghcr.io/base2services/ciinabox-nginx',
             PortMappings: [{
                 HostPort: 8080,
                 ContainerPort: 80

data/templates/services/jenkins.rb

@@ -18,7 +18,7 @@ if not defined? ciinabox_repo
   ciinabox_repo=''
 end
 
-image = "#{ciinabox_repo}base2/ciinabox-jenkins:lts"
+image = "#{ciinabox_repo}ghcr.io/base2services/ciinabox-jenkins:lts"
 
 jenkins_java_opts = ''
 memory = 2048
@@ -110,7 +110,7 @@ if defined? include_diind_slave and include_diind_slave
   dind_definition = {
       Name: 'jenkins-docker-dind-slave',
       Memory: slave_memory,
-      Image: "#{ciinabox_repo}base2/ciinabox-docker-slave:#{docker_slave_version}",
+      Image: "#{ciinabox_repo}ghcr.io/base2services/ciinabox-docker-slave:#{docker_slave_version}",
       Environment: [{Name: 'RUN_DOCKER_IN_DOCKER', Value: 1}],
       Essential: false,
       Privileged: true
@@ -141,7 +141,7 @@ if defined? include_dood_slave and include_dood_slave
   dood_definition =  {
       Name: 'jenkins-docker-dood-slave',
       Memory: slave_memory,
-      Image: "#{ciinabox_repo}base2/ciinabox-docker-slave:#{docker_slave_version}",
+      Image: "#{ciinabox_repo}ghcr.io/base2services/ciinabox-docker-slave:#{docker_slave_version}",
       Environment: [{Name: 'RUN_DOCKER_IN_DOCKER', Value: 0}],
       MountPoints: [
           {

data/templates/services/nexus.rb

@@ -5,7 +5,7 @@ if !defined? timezone
   timezone = 'GMT'
 end
 
-image = 'base2/ciinabox-nexus'
+image = 'ghcr.io/base2services/ciinabox-nexus'
 container_path = '/sonatype-work'
 java_opts = ''
 memory = 1024

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciinabox-ecs
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.3.0.alpha.1612323213
 platform: ruby
 authors:
 - Base2Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2021-02-03 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.8
 signing_key: 
 specification_version: 4
 summary: Manage ciinabox on Aws Ecs