smartcloud 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77ed71de3cc780a8cd8672f942b0f31691309159dc941b88bef8be0fbfc36561
-  data.tar.gz: db7906edf628c1d762415148c1932bd86feb01dfee647c7ca8b075f095689432
+  metadata.gz: 85369e5e6c9d09e3120c224b6032b3498bd4d7f9fa896245b2f65f601f9c6c88
+  data.tar.gz: cde8d32810801ed981f0359dcc82b2fb837cdd10c79c9524c9db248f9fe6379e
 SHA512:
-  metadata.gz: 07f54bcb600bdeaef2405a741b9a05b7522264d517d7999a5b7dbbec0214d5552deba01567862b458e1c94fea0acd97e1aef2b574ff71d9e5c9b1af0e8490d05
-  data.tar.gz: a29bcfb7e3c84b5de7038ce9148a1d17772b26535aac05665b0c56b610c2d06c2a663fcbf023150e990fe20c6081d738c74934896c277e61855670118b78f69b
+  metadata.gz: f972998785f3eb1931992ae1512e1510f363151fee1c3a328fc422a15a5351bdd1d120f149ee43636dadafcdbdde33f8f906fb1c88db045b6b1c4530bb1c4ed6
+  data.tar.gz: d87aa2dec7bb4620bf5ecc9329afe1b53335da305b21e4b0035b81d65fec755243583bde24184cdfeaca560ad7b95ad943aa1fa22f3e1dfbeb2d4296e1f29208

data/README.md

@@ -1,4 +1,6 @@
 # SmartCloud
+Git push should deploy.
+
 Smartcloud is a full-stack deployment framework for Rails optimized for programmer happiness and peaceful administration. It encourages natural simplicity by favoring convention over configuration.
 
 Deploy your Rails apps to your own server with - git push production master

data/lib/smartcloud/apps/rails.rb

@@ -55,16 +55,16 @@ module Smartcloud
 					--volume='#{Smartcloud.config.user_home_path}/.smartcloud/config:#{Smartcloud.config.user_home_path}/.smartcloud/config' \
 					--volume='#{container_path_with_version}:/app' \
 					--volume='#{container_path}/app/vendor/bundle:/app/vendor/bundle' \
-					--volume='#{container_path}/app/public:/app/public/assets' \
-					--volume='#{container_path}/app/public:/app/public/packs' \
+					--volume='#{container_path}/app/public/assets:/app/public/assets' \
+					--volume='#{container_path}/app/public/packs:/app/public/packs' \
 					--volume='#{container_path}/app/node_modules:/app/node_modules' \
 					--restart='always' \
 					--init \
 					--network='nginx-network' \
 					smartcloud/buildpacks/rails", out: File::NULL)
 
-					# system("docker network connect solr-network #{new_container}")
 					system("docker network connect mysql-network #{new_container}")
+					system("docker network connect elasticsearch-network #{new_container}")
 
 					if system("docker start --attach #{new_container}")
 						logger.debug "Starting Web Server ..."

data/lib/smartcloud/boot.rb

@@ -17,6 +17,7 @@ require 'smartcloud/buildpacker'
 
 require 'smartcloud/user'
 
+require 'smartcloud/grids/elasticsearch'
 require 'smartcloud/grids/mysql'
 require 'smartcloud/grids/nginx'
 require 'smartcloud/grids/prereceiver'

data/lib/smartcloud/credentials.rb

@@ -65,6 +65,9 @@ module Smartcloud
 			    password: #{SecureRandom.hex(16)}
 			    database_name: #{SecureRandom.hex(4)}_production
 
+  			  elasticsearch:
+  			    port: 9200
+
 			  redmine:
 			    admin_username: admin
 			    admin_password: #{SecureRandom.hex(16)}

data/lib/smartcloud/docker.rb

@@ -17,15 +17,16 @@ module Smartcloud
 
 			puts "-----> Installing Docker"
 			commands = [
-				"sudo apt-get update",
-				"sudo apt-get install apt-transport-https ca-certificates curl software-properties-common",
+				"sudo apt-get -y update",
+				"sudo apt-get -y install apt-transport-https ca-certificates curl software-properties-common",
 				"curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -",
 				"sudo apt-key fingerprint 0EBFCD88",
 				"sudo add-apt-repository \"deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable\"",
-				"sudo apt-get update",
-				"sudo apt-get install docker-ce",
+				"sudo apt-get -y update",
+				"sudo apt-get -y install docker-ce",
 				"sudo usermod -aG docker $USER",
-				"docker run --rm hello-world"
+				"docker run --rm hello-world",
+				"docker rmi hello-world"
 			]
 			ssh.run commands
 

data/lib/smartcloud/grids/elasticsearch.rb

@@ -0,0 +1,91 @@
+# The main Smartcloud Grids Elasticsearch driver
+module Smartcloud
+	module Grids
+		class Elasticsearch < Smartcloud::Base
+			def initialize
+			end
+
+			def install
+				self.uninstall
+
+				print "-----> Creating settings for elasticsearch ... "
+
+				vm_max_map_count_filepath = "~/.smartcloud/grids/grid-elasticsearch/vm_max_map_count"
+				ssh = Smartcloud::SSH.new
+				ssh.run "sudo sysctl -b vm.max_map_count > #{vm_max_map_count_filepath}"
+				ssh.run "sudo sysctl -w vm.max_map_count=262144"
+
+				puts "done"
+			end
+
+			def uninstall
+				print "-----> Removing settings for elasticsearch ... "
+
+				vm_max_map_count_filepath = "~/.smartcloud/grids/grid-elasticsearch/vm_max_map_count"
+				ssh = Smartcloud::SSH.new
+				ssh.run "test -f #{vm_max_map_count_filepath} && sudo sysctl -w vm.max_map_count=$(cat #{vm_max_map_count_filepath})"
+				ssh.run "test -f #{vm_max_map_count_filepath} && rm #{vm_max_map_count_filepath}"
+
+				puts "done"
+			end
+
+			def self.up(*args)
+				args.flatten!
+				exposed = args.empty? ? '' : args.shift
+
+				if Smartcloud::Docker.running?
+					# Creating networks
+					unless system("docker network inspect elasticsearch-network", [:out, :err] => File::NULL)
+						print "-----> Creating network elasticsearch-network ... "
+						if system("docker network create elasticsearch-network", out: File::NULL)
+							puts "done"
+						end
+					end
+
+					# Creating & Starting containers
+					print "-----> Creating container elasticsearch ... "
+					if system("docker create \
+						--name='elasticsearch' \
+						--env discovery.type=single-node \
+						--env cluster.name=elasticsearch-cluster \
+						--env bootstrap.memory_lock=true \
+						--env 'ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true' \
+						--ulimit memlock=-1:-1 \
+						--user `id -u`:`id -g` \
+						#{"--publish='#{Smartcloud.credentials.elasticsearch[:port]}:#{Smartcloud.credentials.elasticsearch[:port]}'" if exposed == '--exposed'} \
+						--volume='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-elasticsearch/data:/usr/share/elasticsearch/data' \
+						--restart='always' \
+						--network='elasticsearch-network' \
+						elasticsearch:7.4.1", out: File::NULL)
+
+						puts "done"
+						print "-----> Starting container elasticsearch ... "
+						if system("docker start elasticsearch", out: File::NULL)
+							puts "done"
+						end
+					end
+				end
+			end
+	
+			def self.down
+				if Smartcloud::Docker.running?
+					# Stopping & Removing containers - in reverse order
+					print "-----> Stopping container elasticsearch ... "
+					if system("docker stop 'elasticsearch'", out: File::NULL)
+						puts "done"
+						print "-----> Removing container elasticsearch ... "
+						if system("docker rm 'elasticsearch'", out: File::NULL)
+							puts "done"
+						end
+					end
+
+					# Removing networks
+					print "-----> Removing network elasticsearch-network ... "
+					if system("docker network rm elasticsearch-network", out: File::NULL)
+						puts "done"
+					end
+				end
+			end			
+		end
+	end
+end

data/lib/smartcloud/grids/prereceiver.rb

@@ -122,6 +122,9 @@ module Smartcloud
 						logger.fatal "This version name already exists ... Failed."
 						return
 					end
+				else
+					# Allow the push to complete for all other branches normally.
+					exit 10
 				end
 
 				logger.formatter = nil

data/lib/smartcloud/grids/redmine.rb

@@ -22,6 +22,7 @@ module Smartcloud
 						--env REDMINE_DB_PASSWORD=#{Smartcloud.credentials.redmine[:database_password]} \
 						--env REDMINE_DB_DATABASE=#{Smartcloud.credentials.redmine[:database_name]} \
 						--env REDMINE_PLUGINS_MIGRATE=#{Smartcloud.credentials.redmine[:plugins_migrate]} \
+						--volume='#{Smartcloud.config.user_home_path}/.smartcloud/apps/repositories:/repositories:ro' \
 						--volume='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-redmine/files:/usr/src/redmine/files' \
 						--restart='always' \
 						--network='nginx-network' \

data/lib/smartcloud/machine.rb

@@ -28,9 +28,15 @@ module Smartcloud
 			ssh = Smartcloud::SSH.new
 			ssh.run "smartcloud buildpacker install"
 			ssh.run "smartcloud prereceiver install"
+
+			elasticsearch = Smartcloud::Grids::Elasticsearch.new
+			elasticsearch.install
 		end
 
 		def stop
+			elasticsearch = Smartcloud::Grids::Elasticsearch.new
+			elasticsearch.uninstall
+
 			ssh = Smartcloud::SSH.new
 			ssh.run "smartcloud prereceiver uninstall"
 			ssh.run "smartcloud buildpacker uninstall"
@@ -175,6 +181,10 @@ module Smartcloud
 
 				'grids',
 
+				'grids/grid-elasticsearch',
+				'grids/grid-elasticsearch/vm_max_map_count',
+				'grids/grid-elasticsearch/data/***',
+
 				'grids/grid-mysql',
 				'grids/grid-mysql/data/***',
 
@@ -206,6 +216,10 @@ module Smartcloud
 
 				'grids',
 
+				'grids/grid-elasticsearch',
+				'grids/grid-elasticsearch/data',
+				'grids/grid-elasticsearch/data/.keep',
+
 				'grids/grid-mysql',
 				'grids/grid-mysql/data',
 				'grids/grid-mysql/data/.keep',

data/lib/smartcloud/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Smartcloud
-	VERSION = "0.2.0".freeze
+	VERSION = "0.3.0".freeze
 
 	def self.version
 		@@version ||= VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Timeboard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2019-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -85,6 +85,8 @@ files:
 - lib/smartcloud/engine.rb
 - lib/smartcloud/engine/Dockerfile
 - lib/smartcloud/engine/buildpacks/rails/Dockerfile
+- lib/smartcloud/grids/elasticsearch.rb
+- lib/smartcloud/grids/grid-elasticsearch/.keep
 - lib/smartcloud/grids/grid-mysql/docker-entrypoint-initdb.d/.keep
 - lib/smartcloud/grids/grid-nginx/.keep
 - lib/smartcloud/grids/grid-prereceiver/Dockerfile
@@ -273,6 +275,7 @@ files:
 - lib/smartcloud/templates/dotsmartcloud/bin/smartcloud.sh
 - lib/smartcloud/templates/dotsmartcloud/config/environment.rb
 - lib/smartcloud/templates/dotsmartcloud/config/users.yml
+- lib/smartcloud/templates/dotsmartcloud/grids/grid-elasticsearch/data/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-mysql/data/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-nginx/certificates/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-nginx/fastcgi.conf