smartcloud 0.2.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdcdee99df7d2882b59c62eeae3a8248e98f61e4ffb41d717092b2a6b8493a16
-  data.tar.gz: 8c467e8d8e848ff2c5005fb61f3c97155d28a3e5575c844573e96574b2ab0f7e
+  metadata.gz: 771fafc023e8af4228d942f6629a05c1607f8b3bed34c79e79190083ce6b9d7b
+  data.tar.gz: a57da3cf4e496b8fea60db3bde5b2a2f2ae1e55f0862659ffaa3208310cb0ac1
 SHA512:
-  metadata.gz: e296e2c051b797469c934fff6539e070345da995f132043461e9290339b2607389c525ebaa4f7a8f5e706b7db9b272e33dc085549f77e881b53b13a969dea2cb
-  data.tar.gz: a3d536431dfd462b9920422aaf0a57d9dc09f0db15497e56f866f7abf4a5ce9bce7f3a8fdf612c7654425c6cf8c06b40154ee4e07eeca2ef7938d6648f87dee7
+  metadata.gz: 0a7a46a96df2b9ffecb71f283d160bec26a7fef5153c90d6583310a3b73928e20776ebe45470604e531556d12f6416dc6532963cacb9a06e6acd0ae5cb7edcdf
+  data.tar.gz: 140f28602924a10a725612ea8011036dd3fca8b68a9860955492420e9461625883ccc255de0b174fc88f3b2e2847763ce210f0d6f0016b00d0e37ed5c63a9cba

data/lib/smartcloud/apps/rails.rb

@@ -63,7 +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 elasticsearch-network #{new_container}")
+					system("docker network connect minio-network #{new_container}")
 					system("docker network connect mysql-network #{new_container}")
 
 					if system("docker start --attach #{new_container}")
@@ -118,7 +119,7 @@ module Smartcloud
 
 				# Fix for mysql2 gem to support sha256_password, until it is fixed in main mysql2 gem.
 				# https://github.com/brianmario/mysql2/issues/1023
-				exit_status = system("mkdir ./lib/mariadb && ln -s /usr/lib/mariadb/plugin ./lib/mariadb/plugin")
+				exit_status = system("mkdir -p ./lib/mariadb && ln -s /usr/lib/mariadb/plugin ./lib/mariadb/plugin")
 
 				if exit_status
 					return true

data/lib/smartcloud/boot.rb

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

data/lib/smartcloud/credentials.rb

@@ -58,6 +58,11 @@ module Smartcloud
 			    username: #{SecureRandom.hex(8)}
 			    password: #{SecureRandom.hex(16)}
 
+  			  minio:
+  			    port: 9000
+  			    access_key: #{SecureRandom.hex(8)}
+  			    secret_key: #{SecureRandom.hex(16)}
+
 			  mysql:
 			    port: 3306
 			    root_password: #{SecureRandom.hex(16)}
@@ -65,6 +70,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/minio.rb

@@ -0,0 +1,64 @@
+# The main Smartcloud Grids Minio driver
+module Smartcloud
+	module Grids
+		class Minio < Smartcloud::Base
+			def initialize
+			end
+
+			def self.up(*args)
+				args.flatten!
+				exposed = args.empty? ? '' : args.shift
+
+				if Smartcloud::Docker.running?
+					# Creating networks
+					unless system("docker network inspect minio-network", [:out, :err] => File::NULL)
+						print "-----> Creating network minio-network ... "
+						if system("docker network create minio-network", out: File::NULL)
+							puts "done"
+						end
+					end
+
+					# Creating & Starting containers
+					print "-----> Creating container minio ... "
+					if system("docker create \
+						--name='minio' \
+						--env MINIO_ACCESS_KEY=#{Smartcloud.credentials.minio[:access_key]} \
+						--env MINIO_SECRET_KEY=#{Smartcloud.credentials.minio[:secret_key]} \
+						--user `id -u`:`id -g` \
+						#{"--publish='#{Smartcloud.credentials.minio[:port]}:#{Smartcloud.credentials.minio[:port]}'" if exposed == '--exposed'} \
+						--volume='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-minio/data:/data' \
+						--restart='always' \
+						--network='minio-network' \
+						minio/minio:RELEASE.2020-02-27T00-23-05Z server /data", out: File::NULL)
+
+						puts "done"
+						print "-----> Starting container minio ... "
+						if system("docker start minio", 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 minio ... "
+					if system("docker stop 'minio'", out: File::NULL)
+						puts "done"
+						print "-----> Removing container minio ... "
+						if system("docker rm 'minio'", out: File::NULL)
+							puts "done"
+						end
+					end
+
+					# Removing networks
+					print "-----> Removing network minio-network ... "
+					if system("docker network rm minio-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/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,13 @@ module Smartcloud
 
 				'grids',
 
+				'grids/grid-elasticsearch',
+				'grids/grid-elasticsearch/data/***',
+				'grids/grid-elasticsearch/logs/***',
+
+				'grids/grid-minio',
+				'grids/grid-minio/data/***',
+
 				'grids/grid-mysql',
 				'grids/grid-mysql/data/***',
 
@@ -206,6 +219,16 @@ 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-minio',
+				'grids/grid-minio/data',
+				'grids/grid-minio/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.3".freeze
+	VERSION = "0.4.1".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.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Timeboard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-26 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -85,6 +85,9 @@ 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-minio/.keep
 - lib/smartcloud/grids/grid-mysql/docker-entrypoint-initdb.d/.keep
 - lib/smartcloud/grids/grid-nginx/.keep
 - lib/smartcloud/grids/grid-prereceiver/Dockerfile
@@ -260,6 +263,7 @@ files:
 - lib/smartcloud/grids/grid-solr/docker-entrypoint-initdb.d/.keep
 - lib/smartcloud/grids/grid-solr/sunspot/conf/schema.xml
 - lib/smartcloud/grids/grid-solr/sunspot/conf/solrconfig.xml
+- lib/smartcloud/grids/minio.rb
 - lib/smartcloud/grids/mysql.rb
 - lib/smartcloud/grids/nginx.rb
 - lib/smartcloud/grids/prereceiver.rb
@@ -273,6 +277,9 @@ 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-minio/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