smartcloud 0.2.2 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3a4b06c6842a024e3757c3c13f4c68e6c89eb8cda63d7c3a4c1a6ef91a5fcd9
-  data.tar.gz: a662e9487b659b6e5acdead2aa6477c6c9f6de79ae0fefbf7737c2cc22f71f0c
+  metadata.gz: 474fdd2356fd60ade2ebb2cad2982ebf66d2d045ae19559e13d7cc244b43657a
+  data.tar.gz: 17f10d83a70e04d06ba32205bbe3878da6eec8b106898c385fdc36bf00b0e24a
 SHA512:
-  metadata.gz: 8e7559e579857751c931e9f3fd7918748eaf92fface204a9f97701600061462e16b76c52c4fe04a91cf7bbd0b824f447d55fc900d11f3864da4583fcb369d494
-  data.tar.gz: 671f84d2d73034bae9cea1195ddd847d26cf978fa1065e0ad721fbe478aee8f8889af21fc855ef9b414bc61f771be341f3e9e7285f5d70027f0d658721dc8bf0
+  metadata.gz: 2f27dfd480192c5eac77388da0c8e94487a7266b7b4596ad9b1883cf98a14932b8d4b096f9b10a7512788b002254231f7614099a61ced315075e360830f31dd3
+  data.tar.gz: 612b0aa19cce9b011b720c994917b6977507ed6e46861d3a007c43247a4d922379b331453684bbd070dc41d753b051104073922395aa4ebb9205c5e9de6c11cd

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

@@ -63,8 +63,8 @@ module Smartcloud
 					--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/grids/elasticsearch.rb

@@ -0,0 +1,90 @@
+# 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 ... "
+
+				ssh = Smartcloud::SSH.new
+				ssh.run "echo 'vm.max_map_count=262144' | sudo tee /etc/sysctl.d/60-smartcloud-elasticsearch.conf && sudo sysctl --system"
+
+				puts "done"
+			end
+
+			def uninstall
+				print "-----> Removing settings for elasticsearch ... "
+
+				ssh = Smartcloud::SSH.new
+				# NOTE: sysctl does not reset this setting until restart of system even after sudo sysctl --system is run.
+				ssh.run "test -f /etc/sysctl.d/60-smartcloud-elasticsearch.conf && sudo rm /etc/sysctl.d/60-smartcloud-elasticsearch.conf && sudo sysctl --system"
+
+				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 'ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true' \
+						--env bootstrap.memory_lock=true \
+						--ulimit memlock=-1:-1 \
+						--ulimit nofile=65535:65535 \
+						--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' \
+						--volume='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-elasticsearch/logs:/usr/share/elasticsearch/logs' \
+						--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/data/***',
+				'grids/grid-elasticsearch/logs/***',
+
 				'grids/grid-mysql',
 				'grids/grid-mysql/data/***',
 
@@ -206,6 +216,12 @@ module Smartcloud
 
 				'grids',
 
+				'grids/grid-elasticsearch',
+				'grids/grid-elasticsearch/data',
+				'grids/grid-elasticsearch/data/.keep',
+				'grids/grid-elasticsearch/logs',
+				'grids/grid-elasticsearch/logs/.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.2".freeze
+	VERSION = "0.3.2".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.2
+  version: 0.3.2
 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,8 @@ 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-elasticsearch/logs/.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