smartcloud 0.3.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241790f96253161b990bfc75ef559b5872849e8f4dec6ccad65cdef173789144
-  data.tar.gz: 7d6296cd2e0851b53758d2d1971d05903892dbac659b2c9783ce9484a4f28bfc
+  metadata.gz: 7b4fd82d9d4bff19e4ccf13550134ee76772adcf128014ffabe60875e186a293
+  data.tar.gz: f794d1aa22b50f4448222f37320b00a1301e93054d85942b410d9e2f54287022
 SHA512:
-  metadata.gz: add6e6dfaca24de43ec1a45bbf0b3da91651c605e37591cde402629fa5e184f1c6997740ab30dd180e8477a7434d3b7f63b5d0a0edc061143972f66a94f842b5
-  data.tar.gz: '038a10133f0e716a093b083722635cc52fad448e309e2fb92e837abb6d603508432c1fd4d627d19bdf2b8513f7e3596c383e88453f028f5ddb0ede815a068185'
+  metadata.gz: f96218c7bc601ae5a4bfd0ad9d289e432ad6ecef234280c0128a695d910f4ae9c0f42a04f04487b22c668c5346985e7a25416772e88c1e9af4b700716b56423e
+  data.tar.gz: daef98755e7880eeb5e9b422bf6659c6c6b0eac058a4d65dea9e4cf07496e4de860432496915f62822ca38bdbb9030edbdda5c79495401ed1ab8a836389256a1

data/lib/smartcloud/apps/rails.rb

@@ -35,10 +35,12 @@ module Smartcloud
 				FileUtils.mkdir_p("#{container_path}/app/public/assets")
 				FileUtils.mkdir_p("#{container_path}/app/public/packs")
 				FileUtils.mkdir_p("#{container_path}/app/node_modules")
+				FileUtils.mkdir_p("#{container_path}/app/storage")
 				FileUtils.mkdir_p("#{container_path_with_version}/vendor/bundle")
 				FileUtils.mkdir_p("#{container_path_with_version}/public/assets")
 				FileUtils.mkdir_p("#{container_path_with_version}/public/packs")
 				FileUtils.mkdir_p("#{container_path_with_version}/node_modules")
+				FileUtils.mkdir_p("#{container_path_with_version}/storage")
 
 				# Creating & Starting container
 				container_id = `docker ps -a -q --filter='name=^#{appname}_1$' --filter='status=running'`.chomp
@@ -58,13 +60,15 @@ module Smartcloud
 					--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' \
+					--volume='#{container_path}/app/storage:/app/storage' \
 					--restart='always' \
 					--init \
 					--network='nginx-network' \
 					smartcloud/buildpacks/rails", out: File::NULL)
 
-					system("docker network connect mysql-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}")
 						logger.debug "Starting Web Server ..."
@@ -118,7 +122,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
@@ -133,8 +137,14 @@ module Smartcloud
 				logger.info "Performing bundle install ..."
 
 				set_logger_formatter_tabs
+
+				unless system("bundle config set deployment 'true' && bundle config set clean 'true'")
+					logger.error "Could not complete bundle config setting."
+					return false
+				end
+
 				exit_status = nil
-				Open3.popen2e("bundle", "install", "--deployment", "--clean") do |stdin, stdout_and_stderr, wait_thr|
+				Open3.popen2e("bundle", "install") do |stdin, stdout_and_stderr, wait_thr|
 					stdout_and_stderr.each { |line| logger.info "#{line}" }
 					exit_status = wait_thr.value.success?
 				end

data/lib/smartcloud/boot.rb

@@ -18,6 +18,7 @@ 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,12 +58,19 @@ module Smartcloud
 			    username: #{SecureRandom.hex(8)}
 			    password: #{SecureRandom.hex(16)}
 
+  			  minio:
+  			    hostname: #{SecureRandom.hex(8)}
+  			    access_key: #{SecureRandom.hex(8)}
+  			    secret_key: #{SecureRandom.hex(16)}
+  			    browser: on
+  			    worm: off
+
 			  mysql:
 			    port: 3306
 			    root_password: #{SecureRandom.hex(16)}
 			    username: #{SecureRandom.hex(8)}
 			    password: #{SecureRandom.hex(16)}
-			    database_name: #{SecureRandom.hex(4)}_production
+			    database_name: #{SecureRandom.hex(8)}
 
   			  elasticsearch:
   			    port: 9200
@@ -76,7 +83,7 @@ module Smartcloud
 			    database_port: 3306
 			    database_username: #{SecureRandom.hex(8)}_redmine
 			    database_password: #{SecureRandom.hex(16)}
-			    database_name: #{SecureRandom.hex(4)}_redmine_production
+			    database_name: #{SecureRandom.hex(8)}_redmine
 			    # plugins_migrate: true
 			YAML
 		end

data/lib/smartcloud/engine/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6.4-alpine3.10
+FROM ruby:2.7.0-alpine3.11
 LABEL maintainer="Timeboard <hello@timeboard.me>"
 
 # User

data/lib/smartcloud/engine/buildpacks/rails/Dockerfile

@@ -14,6 +14,6 @@ RUN apk add --update build-base && \
     rm -rf /var/cache/apk/*
 
 # Gems
-RUN gem install bundler
+RUN gem install bundler -v 2.1.4
 
 CMD ["buildpacker", "pack"]

data/lib/smartcloud/grids/elasticsearch.rb

@@ -10,10 +10,8 @@ module Smartcloud
 
 				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"
+				ssh.run "echo 'vm.max_map_count=262144' | sudo tee /etc/sysctl.d/60-smartcloud-elasticsearch.conf && sudo sysctl --system"
 
 				puts "done"
 			end
@@ -21,10 +19,9 @@ module Smartcloud
 			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}"
+				# 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

data/lib/smartcloud/grids/minio.rb

@@ -0,0 +1,77 @@
+# 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 VIRTUAL_HOST=#{Smartcloud.credentials.minio[:hostname]}.#{Smartcloud.config.apps_domain} \
+						--env LETSENCRYPT_HOST=#{Smartcloud.credentials.minio[:hostname]}.#{Smartcloud.config.apps_domain} \
+						--env LETSENCRYPT_EMAIL=#{Smartcloud.config.sysadmin_email} \
+						--env LETSENCRYPT_TEST=false \
+						--env MINIO_ACCESS_KEY=#{Smartcloud.credentials.minio[:access_key]} \
+						--env MINIO_SECRET_KEY=#{Smartcloud.credentials.minio[:secret_key]} \
+						--env MINIO_BROWSER=#{Smartcloud.credentials.minio[:browser]} \
+						--env MINIO_WORM=#{Smartcloud.credentials.minio[:worm]} \
+						--user `id -u`:`id -g` \
+						--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)
+
+						# The alias is necessary to support internal network requests directed to minio container using public url
+						system("docker network connect --alias #{Smartcloud.credentials.minio[:hostname]}.#{Smartcloud.config.apps_domain} minio-network nginx")
+						system("docker network connect nginx-network minio")
+
+						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?
+					# Disconnecting networks
+					system("docker network disconnect nginx-network minio")
+					system("docker network disconnect minio-network nginx")
+
+					# 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/machine.rb

@@ -182,10 +182,12 @@ module Smartcloud
 				'grids',
 
 				'grids/grid-elasticsearch',
-				'grids/grid-elasticsearch/vm_max_map_count',
 				'grids/grid-elasticsearch/data/***',
 				'grids/grid-elasticsearch/logs/***',
 
+				'grids/grid-minio',
+				'grids/grid-minio/data/***',
+
 				'grids/grid-mysql',
 				'grids/grid-mysql/data/***',
 
@@ -223,6 +225,10 @@ module Smartcloud
 				'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.3.1".freeze
+	VERSION = "0.4.4".freeze
 
 	def self.version
 		@@version ||= VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.4
 platform: ruby
 authors:
 - Timeboard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -87,6 +87,7 @@ files:
 - 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
@@ -262,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
@@ -277,6 +279,7 @@ files:
 - 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
@@ -308,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Full-stack deployment framework for Rails.