ciinabox-ecs 0.2.17.alpha.1612322070 → 0.3.0.alpha.1617686815

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 950c9d5e0c1f37277b1c365f72315fb1d0807b8cbde7db116517569f850cc196
-  data.tar.gz: 6ca4a35410b7e9a553b9bddedaaf6805b681403023b7ac106e7bca68a43f2f2b
+  metadata.gz: 14782968f00b111af7ccdd5762e480add7a5d0ced53a87e543599fc67345e87e
+  data.tar.gz: 845da850d5bf760b74f309c7db3021e4de785f7355b0bef2cbce8ba7f94c9ae4
 SHA512:
-  metadata.gz: d35fa68e01405d1f5ca917a8a6f7b13138a924305c1e2aa6d3b71215d6bd66bb39deb3d68660644b0fbda3a3f8f271d738a87c997476c5d906b4a2424188e783
-  data.tar.gz: 55da6021f706b50bd0c68ef6a6aa506eddfab2b5826a83ef1e08a84b0aea3ee9c4532303643f2bda52f709555c9a38d2b04ba65b877ddb0407c5f0c87f234889
+  metadata.gz: 4f14dcc2690e9982f9061f6f653ac8085b389c00ae17f9cccc3abecd6b5028d3d69382f79f5aeb1a5fcdb25df3318c9e24e7fe603fe07b480b9735632f92d42b
+  data.tar.gz: f2a58bf4c1a25ccd1be523f0d2590fb37bc4621e2212bcd6e6b15246cff63758c0a2864228632bc12dce6dbacba81a1196f6a0be2c8eab98bcc03e76596d56d0

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/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'
@@ -15,10 +16,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}ghcr.io/base2services/ciinabox-jenkins:lts"
+image = "#{ciinabox_repo}/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}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
@@ -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}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.2.17.alpha.1612322070
+  version: 0.3.0.alpha.1617686815
 platform: ruby
 authors:
 - Base2Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-04-06 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.15
 signing_key: 
 specification_version: 4
 summary: Manage ciinabox on Aws Ecs