ciinabox-ecs 0.3.0.alpha.1612411765 → 0.3.1.alpha.1622695860

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 295d59492bfdba11f5529ed80248fd516c2aa25d1d3a34b5122e253b92f962d8
-  data.tar.gz: 5bf0fc48b3a163fbebea55431a472fc14215b58f837b17834456ceeecde00ad7
+  metadata.gz: 1fba847852f3f33d382b88331f1e515c94d78deb4a8dbd94b11a2de6adfd128b
+  data.tar.gz: d6a046c17fc32c6ac67071e7046ba6bd469e73ffe6b2ae0612b80480d895d0e6
 SHA512:
-  metadata.gz: 26bc218ceb71ad26c5489e07a60e9ca49386d45dc5506a40108dc2fc07098269d5115e2822d185359dbce004dffe9c6ffff59d2fd3450c544b0a6fd7563ae07f
-  data.tar.gz: 3a1b9a52304547f45b9c4eee818f9513158167c92401b2d90bcf2d2b49505acd4db4930d36bed7a79bc1a50a22601ee210bf2228282e5a64de8b1db9232e380a
+  metadata.gz: 1e3c27b8bff9b261fba646cb43eac0047f477fb67f4b604416aa644a9ccd26ae2a882546bd0a88a95e524e2b2d9d90389fa87f73c2271140a94360b956fea939
+  data.tar.gz: 2ae6ce0b9cf7bf880f8bcddbedb98067ed5b2f3cfc145072ca4734c19da76f12e1aebbfde1062aed751981099a3ee5611795c9eb6d3ea38b2a9a7f6ddace8dea

data/templates/ecs-cluster.rb

@@ -190,6 +190,8 @@ CloudFormation {
         "echo ECS_ENABLE_TASK_CPU_MEM_LIMIT=false >> /etc/ecs/ecs.config\n",
         "INSTANCE_ID=$(echo `/opt/aws/bin/ec2-metadata -i | cut -f2 -d:`)\n",
         "PRIVATE_IP=`/opt/aws/bin/ec2-metadata -o | cut -f2 -d: | cut -f2 -d-`\n",
+        "echo 'vm.max_map_count=262144' >> /etc/sysctl.conf\n",
+        "sysctl -p\n",
         "hostname ciinabox-ecs-xx\n",
         "#{proxy_config_userdata}",
         "yum install -y python-pip\n",

data/templates/services/drone.rb

@@ -1,6 +1,7 @@
 require 'cfndsl'
 require 'securerandom'
 require 'deep_merge'
+require_relative '../../ext/helper'
 
 # default values
 shared_envs = {

data/templates/services/jenkins.rb

@@ -1,4 +1,5 @@
 require 'cfndsl'
+require_relative '../../ext/helper'
 
 if !defined? timezone
   timezone = 'GMT'
@@ -109,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}ghcr.io/base2services/ciinabox-docker-slave:#{docker_slave_version}",
+      Image: "#{ciinabox_repo}/ciinabox-docker-slave:#{docker_slave_version}",
       Environment: [{Name: 'RUN_DOCKER_IN_DOCKER', Value: 1}],
       Essential: false,
       Privileged: true
@@ -140,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}ghcr.io/base2services/ciinabox-docker-slave:#{docker_slave_version}",
+      Image: "#{ciinabox_repo}/ciinabox-docker-slave:#{docker_slave_version}",
       Environment: [{Name: 'RUN_DOCKER_IN_DOCKER', Value: 0}],
       MountPoints: [
           {

data/templates/services/sonarqube.rb

@@ -0,0 +1,127 @@
+require 'cfndsl'
+require_relative '../../ext/helper'
+
+if !defined? timezone
+  timezone = 'GMT'
+end
+
+image = 'sonarqube:lts'
+java_opts = ''
+memory = 2048
+cpu = 300
+container_port = 0
+service = lookup_service('sonarqube', services)
+if service
+  java_opts = service['JAVA_OPTS'] || ''
+  image = service['ContainerImage'] || image
+  memory = service['ContainerMemory'] || 2048
+  cpu = service['ContainerCPU'] || 300
+  container_port = service['InstancePort'] || 0
+end
+
+CloudFormation {
+
+  AWSTemplateFormatVersion "2010-09-09"
+  Description "ciinabox - ECS Service SonarQube v#{ciinabox_version}"
+
+  Parameter("ECSCluster"){ Type 'String' }
+  Parameter("ECSRole"){ Type 'String' }
+  Parameter("ServiceELB"){ Type 'String' }
+
+  Resource('SonarQubeTask') {
+    Type "AWS::ECS::TaskDefinition"
+    Property('ContainerDefinitions', [
+      {
+        Name: 'sonarqube',
+        MemoryReservation: memory,
+        Cpu: cpu,
+        Image: image,
+        Environment: [
+          {
+            Name: 'VIRTUAL_HOST',
+            Value: "sonar.#{dns_domain}"
+          },
+          {
+            Name: 'VIRTUAL_PORT',
+            Value: '9000'
+          }
+        ],
+        Ulimits: [
+          {
+            Name: "nofile",
+            SoftLimit: 65536,
+            HardLimit: 65536
+          }
+        ],
+        Essential: true,
+        MountPoints: [
+          {
+            ContainerPath: '/etc/localtime',
+            SourceVolume: 'timezone',
+            ReadOnly: true
+          },
+          {
+            ContainerPath: '/opt/sonarqube/extensions',
+            SourceVolume: 'sonarqube_extensions',
+            ReadOnly: false
+          },
+          {
+            ContainerPath: '/opt/sonarqube/logs',
+            SourceVolume: 'sonarqube_logs',
+            ReadOnly: false
+          },
+          {
+            ContainerPath: '/opt/sonarqube/data',
+            SourceVolume: 'sonarqube_data',
+            ReadOnly: false
+          }
+        ]
+      }
+    ])
+    Property('Volumes', [
+      {
+        Name: 'timezone',
+        Host: {
+          SourcePath: '/etc/localtime'
+        }
+      },
+      {
+        Name: 'sonarqube_conf',
+        Host: {
+          SourcePath: '/data/sonarqube/conf'
+        }
+      },
+      {
+        Name: 'sonarqube_extensions',
+        Host: {
+          SourcePath: '/data/sonarqube/extensions'
+        }
+      },
+      {
+        Name: 'sonarqube_logs',
+        Host: {
+          SourcePath: '/data/sonarqube/logs'
+        }
+      },
+      {
+        Name: 'sonarqube_data',
+        Host: {
+          SourcePath: '/data/sonarqube/data'
+        }
+      }
+    ])
+  }
+
+  Resource('SonarQubeService') {
+    Type 'AWS::ECS::Service'
+    Property('Cluster', Ref('ECSCluster'))
+    Property('DesiredCount', 1)
+    Property('TaskDefinition', Ref('SonarQubeTask'))
+    Property('Role', Ref('ECSRole')) unless container_port == 0
+    Property('LoadBalancers', [
+      { ContainerName: 'sonarqube', ContainerPort: container_port, LoadBalancerName: Ref('ServiceELB') }
+    ]) unless container_port == 0
+
+  }
+
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciinabox-ecs
 version: !ruby/object:Gem::Version
-  version: 0.3.0.alpha.1612411765
+  version: 0.3.1.alpha.1622695860
 platform: ruby
 authors:
 - Base2Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -147,6 +147,7 @@ files:
 - templates/services/icinga2.rb
 - templates/services/jenkins.rb
 - templates/services/nexus.rb
+- templates/services/sonarqube.rb
 - templates/vpc.rb
 - templates/vpn.rb
 homepage: https://github.com/base2Services/ciinabox-ecs
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.8
+rubygems_version: 3.2.19
 signing_key: 
 specification_version: 4
 summary: Manage ciinabox on Aws Ecs