terra_boi 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d162a2737ae62c82294a990335b21754196bf1ad96f8857b3f784f97dbb6acb5
-  data.tar.gz: 35bacf403df76300cd6307e39b4f4f2aa45084e92c8bcfca6f976bafd97c035c
+  metadata.gz: a3778d98d44fb92002f085027ce5e14b51d77d4dfee1ef11c97a4474191c200c
+  data.tar.gz: 9f8786b9e4c67d19d366cf6a0822ae5f72694480dac17bdf36cde7720d8ee8bf
 SHA512:
-  metadata.gz: ebc804db49cc0718d98582aa47758ecc3dc510721d83a295e834106c98fe089fadb15ffd77cafdaad8566b2bb37e76b24604c16d595b195eb3927f5ee9efbef2
-  data.tar.gz: 457a2ca259134ecad0fb73364a0b37af10ada40ed49eb4323ddc46657c7454140c14b9d5f4e0704488864589d27c2fb75202487dbaa82948c793e3870b0b4b88
+  metadata.gz: 954ea0480e5c6dc1272983f665d5a8e3b46f2e3093df85b9acf4e41c18b8e27cb8a70bfb4f55cab8021a452c11de75598330ee48b482afd96f7a75e1345fbc92
+  data.tar.gz: b93f8776203b459762dee8311880630afe61096ee8921343d9a40e9fdca86f9ce2d0bb3f7bb0a54fe2d9a56988bb41d6c1d6a9372a3c68b3e4e8c2b33a7acd62

data/README.md

@@ -247,4 +247,4 @@ In `lib/terra_boi/version.rb` update version.
 `git add -A`
 `git commit -m "Msg"`
 `git tag -a vX.X.X -m "Msg"`
-`git push --tags`
+`git push && git push --tags`

data/lib/generators/terra_boi/master_worker_generator.rb

@@ -1,4 +1,5 @@
 require "generators/extensions"
+require 'fileutils'
 
 module TerraBoi
 	class MasterWorkerGenerator < Rails::Generators::Base
@@ -43,5 +44,11 @@ module TerraBoi
 	  		env: ['staging', 'prod']
 	  	})
 	  end
+
+	  def create_master_worker_docker_entrypoint_script
+	  	filename = "scripts/start_master_worker.sh"
+	  	template "master_worker_start_script.erb", filename
+			FileUtils.chmod 0755, filename 	
+	  end
 	end
 end

data/lib/generators/terra_boi/templates/master_worker_start_script.erb

@@ -0,0 +1,12 @@
+#!/bin/sh
+# Master worker entrypoint for staging and prod docker containers
+
+rake db:migrate
+
+# Fix link-count, as cron is being a pain, and docker is making hardlink count > 0 (very high)
+touch /etc/crontab /etc/cron.*/*
+
+service cron start
+whenever --update-crontab
+
+rake jobs:work

data/lib/generators/terra_boi/templates/master_worker_user_data.erb

@@ -14,7 +14,7 @@ for line in $( cat /etc/environment ); do export $line; done
 # Set DB environment variables in docker container and
 # start rake jobs:work
 # https://medium.com/@oprearocks/how-to-properly-override-the-entrypoint-using-docker-run-2e081e5feb9d
-docker container run --entrypoint "rake" -p 3000:3000 --name $APPLICATION_NAME --restart always -d \
+docker container run --entrypoint "./scripts/start_master_worker.sh" -p 3000:3000 --name $APPLICATION_NAME --restart always -d \
 -e DB_HOST=$DB_HOST \
 -e DB_USERNAME=$DB_USERNAME \
 -e DB_PASSWORD=$DB_PASSWORD \
@@ -24,10 +24,4 @@ docker container run --entrypoint "rake" -p 3000:3000 --name $APPLICATION_NAME -
 -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \
 -e RAILS_MASTER_KEY=$RAILS_MASTER_KEY \
 -e RAILS_SERVE_STATIC_FILES=true \
-$DOCKERHUB_USERNAME/$APPLICATION_NAME:latest jobs:work
-
-# Run outstanding DB migrations
-docker container exec $APPLICATION_NAME rake db:migrate
-
-# Update and run cron
-docker container exec $APPLICATION_NAME whenever --update-crontab
+$DOCKERHUB_USERNAME/$APPLICATION_NAME:latest

data/lib/terra_boi/version.rb

@@ -1,3 +1,3 @@
 module TerraBoi
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terra_boi
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Charlie Reese
@@ -64,6 +64,7 @@ files:
 - lib/generators/terra_boi/templates/host_initializer.erb
 - lib/generators/terra_boi/templates/master_worker_main.erb
 - lib/generators/terra_boi/templates/master_worker_output.erb
+- lib/generators/terra_boi/templates/master_worker_start_script.erb
 - lib/generators/terra_boi/templates/master_worker_user_data.erb
 - lib/generators/terra_boi/templates/packer_ami_build.erb
 - lib/generators/terra_boi/templates/packer_application.erb