ciinabox-ecs 0.2.16 → 0.3.0.alpha.1612411765

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 762833bf59511dab5a6a489e75c647974d008e42e3aee77344782b150faf5b79
-  data.tar.gz: f7d12b259f8abb60017ff5b4d1a51f93fde95beb11052e37d7119a34bcf1cf2c
+  metadata.gz: 295d59492bfdba11f5529ed80248fd516c2aa25d1d3a34b5122e253b92f962d8
+  data.tar.gz: 5bf0fc48b3a163fbebea55431a472fc14215b58f837b17834456ceeecde00ad7
 SHA512:
-  metadata.gz: 2c4f5b4173f2abf1c118eaba246f7f0eedbbcd3b579058e65ee355c726483c938324a869e3b9268a4fc59ca446d05a08a40c8cb2c9f71e6ceb4f1cff23e51d81
-  data.tar.gz: d237c3a043b066f4d0c6a009232f2c348a1b6a91d0f0db9fed005480615dfd7be22fe35ec6b66cb9d81bb72efeae0a58b984222f5b7f063131442b756c63372e
+  metadata.gz: 26bc218ceb71ad26c5489e07a60e9ca49386d45dc5506a40108dc2fc07098269d5115e2822d185359dbce004dffe9c6ffff59d2fd3450c544b0a6fd7563ae07f
+  data.tar.gz: 3a1b9a52304547f45b9c4eee818f9513158167c92401b2d90bcf2d2b49505acd4db4930d36bed7a79bc1a50a22601ee210bf2228282e5a64de8b1db9232e380a

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

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

@@ -15,10 +15,9 @@ end
 # Prefixing application images allows us to 'vendorize' ciinabox into client's account by setting
 # ciinabox_repo to ${account_no}.dkr.ecr.${region}.amazonaws.com
 if not defined? ciinabox_repo
-  ciinabox_repo=''
+    ciinabox_repo = 'ghcr.io/base2services'
 end
-
-image = "#{ciinabox_repo}base2/ciinabox-jenkins:lts"
+image = "#{ciinabox_repo}/ciinabox-jenkins:lts"
 
 jenkins_java_opts = ''
 memory = 2048
@@ -110,7 +109,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 +140,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.16
+  version: 0.3.0.alpha.1612411765
 platform: ruby
 authors:
 - Base2Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2021-02-04 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