terra_boi 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e07549528cc229186be4d0024ebff13717dffe397b4da9611c2bc9e6601a21a
-  data.tar.gz: e3ea9d7cae1344535ecbcf33a7a22b24679e8b668980f8b4bd0e7d27eabd5551
+  metadata.gz: 4315fdccd989f9477c4fa6911a298f2657ef3833ae5661c3422c375eb5f9fd4f
+  data.tar.gz: 26884beb178531bf6b25eb8226e12f45b8b302672b6d86ebc940f66aa8c579c9
 SHA512:
-  metadata.gz: 9722cee6653bf1790d6ca23f957d32b42098feae3783c7b95cf0337250b6c8dcc7ea43c0fdc66bceece9aaa65ea49fdaf63d57e451c450ebc5bce110fdb581a6
-  data.tar.gz: 3ce672b519f3d22ec25fc71d89b149f8974e8aadc541c7d409343f0fabad56f0866a6cea04cd96050a86225dd045d787a79b0a42e6ca2127ffe8a8a69692b9fc
+  metadata.gz: a9e6f8c686fc902973a0639b77e90f81297038b5282689cdb87560d52f40b388f18c26cadf93e03b0be5b41ad772b65ba1b0f09848568a84614337669b7f242e
+  data.tar.gz: 489520341bcdebd0bb7db4c550d1c98013be808424f4c6c2db54a0f43ceb3b3ebfccb46ff10d953c8925d0a721cbb68adf7b9268bdd0169e9ade21cb8f53bdff

data/README.md

@@ -141,14 +141,14 @@ After these changes propogate (should take about an hour or two locally), your w
 
 You can automatically trigger DockerHub image builds when new code is pushed to a repository's master branch using DockerHub's free Github integration. 
 
-Otherwise, `docker push [DOCKER_USERNAME]/[APPLICATION_NAME]:latest`. Make sure you are pushing to a private repository.
+Otherwise, `docker build . && docker container create [IMAGE_ID] && docker commit [CONTAINER_ID] [DOCKER_USERNAME]/[APPLICATION_NAME]:latest && docker push [DOCKER_USERNAME]/[APPLICATION_NAME]:latest`. Make sure you are pushing to a private repository.
 
 **B. Create Packer AMI:**
 
 ```
 cd packer 
 
-packer build -var DOCKERHUB_ACCESS_TOKEN=$DOCKERHUB_ACCESS_TOKEN -var DOCKERHUB_USERNAME=$DOCKERHUB_USERNAME application.json
+packer build -var DOCKERHUB_ACCESS_TOKEN=$DOCKERHUB_ACCESS_TOKEN -var DOCKERHUB_USERNAME=$DOCKERHUB_USERNAME -var DB_PASSWORD=TF_VAR_db_password application.json
 ```
 
 **C. Clean up:**
@@ -228,4 +228,9 @@ In `lib/terra_boi/version.rb` update version.
 
 **3. Push gem**
 
-`gem push terra_boi-X.X.X.gem` (replace X's with version)
+`gem push terra_boi-X.X.X.gem` (replace X's with version)
+
+**4. Tag GitHub**
+
+`git tag -a vX.X.X -m "Msg"`
+`git push --tags`

data/lib/generators/terra_boi/boilerplate_generator.rb

@@ -28,6 +28,7 @@ module TerraBoi
 	  	generate "terra_boi:state"
 	  	generate "terra_boi:dockerfile --ruby_version #{class_options[:ruby_version]}"
 	  	generate "terra_boi:host_initializer --domain_name #{class_options[:domain_name]}"
+	  	generate "terra_boi:db_config"
 	  	generate "terra_boi:packer"
 	  end
 

data/lib/generators/terra_boi/db_config_generator.rb

@@ -0,0 +1,25 @@
+require "generators/extensions"
+
+module TerraBoi
+	class DbConfigGenerator < Rails::Generators::Base
+	  attr_accessor :application_name
+	  source_root File.expand_path('templates', __dir__)
+
+	  desc (<<-EOF
+		  Generate database.yml (default DB config)
+		  
+		  To execute, run rails generate terra_boi:db_config
+		  EOF
+	  	.gsub(/\t/, '')
+	  )
+
+	  def init
+	  	# defined in lib/generators/extensions
+	  	self.application_name = generate_application_name
+	  end
+
+	  def create_db_config_file
+	  	template "db_config.erb", "config/database.yml"
+	  end
+	end
+end

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

@@ -20,7 +20,7 @@ variable "db_username" {}
 variable "db_password" {}
 
 module "db_and_s3" {
-  source = "github.com/charliereese/terraform_modules//data?ref=v0.0.6"
+  source = "github.com/charliereese/terraform_modules//data?ref=v0.0.7"
 
   env               = "<%= config[:env] %>"
   app_name          = "<%= application_name %>"

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

@@ -0,0 +1,30 @@
+# SQLite. Versions 3.8.0 and up are supported.
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: sqlite3
+  pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  timeout: 5000
+
+development:
+  <<: *default
+  database: db/development.sqlite3
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: db/test.sqlite3
+
+production:
+  <<: *default
+  adapter: postgresql
+  database: <%= application_name %>
+  username: <%%= ENV["DB_USERNAME"] %>
+  password: <%%= ENV["DB_PASSWORD"] %>
+  host: <%%= ENV["DB_HOST"] %>
+  pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>

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

@@ -1,4 +1,4 @@
 Rails.application.configure do
 	config.hosts << '.<%= class_options[:domain_name] %>'
-	config.hosts << /compute\.amazonaws\.com/
+	config.hosts << '.amazonaws.com'
 end

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

@@ -5,6 +5,10 @@ sudo apt-get update
 sudo apt -y install docker.io
 docker --version
 
+# Set DB and DockerHub usernames
+export DB_PASSWORD=$DB_PASSWORD
+export DOCKERHUB_USERNAME=$DOCKERHUB_USERNAME
+
 # # Start the Docker service
 sudo service docker start
 sudo usermod -aG docker ubuntu
@@ -15,8 +19,5 @@ sudo systemctl enable docker
 # Log in
 sudo docker login --username $DOCKERHUB_USERNAME -p $DOCKERHUB_ACCESS_TOKEN
 
-# Run the container:
-# --restart=always i.e. always start the container when the EC2 instance created from this AMI is launched or rebooted
-# --detach , -d i.e. Run container in background and print container ID
-# sudo docker run --restart=always USERNAME/<%= application_name %>:latest
-sudo docker container run -p 3000:3000 --name <%= application_name %> --restart always -d $DOCKERHUB_USERNAME/<%= application_name %>:latest
+# Pull the container:
+sudo docker pull $DOCKERHUB_USERNAME/<%= application_name %>:latest

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

@@ -1,7 +1,8 @@
 {
   "variables": {
   	"DOCKERHUB_ACCESS_TOKEN": "",
-  	"DOCKERHUB_USERNAME": ""
+  	"DOCKERHUB_USERNAME": "",
+  	"DB_PASSWORD": ""
   },
 
   "builders": [{
@@ -34,7 +35,8 @@
 		"type":"shell",
 		"environment_vars": [
     	"DOCKERHUB_ACCESS_TOKEN={{user `DOCKERHUB_ACCESS_TOKEN`}}",
-    	"DOCKERHUB_USERNAME={{user `DOCKERHUB_USERNAME`}}"
+    	"DOCKERHUB_USERNAME={{user `DOCKERHUB_USERNAME`}}",
+    	"DB_PASSWORD={{user `DB_PASSWORD`}}"
     ],
 		"script": "ami_build.sh"
 	}]

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

@@ -3,7 +3,7 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 module "remote_state_locking" {
-  source = "github.com/charliereese/terraform_modules//state?ref=v0.0.6"
+  source = "github.com/charliereese/terraform_modules//state?ref=v0.0.7"
 
   app_name = "<%= application_name %>"
   region   = "us-east-2"

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

@@ -17,7 +17,7 @@ terraform {
 # ---------------------------------------------------------------------------------------------------------------------
 
 module "webserver_cluster" {
-  source = "github.com/charliereese/terraform_modules//web_servers?ref=v0.0.6"
+  source = "github.com/charliereese/terraform_modules//web_servers?ref=v0.0.7"
 
   instance_type       = "t2.micro"
   env                 = "<%= config[:env] %>"

data/lib/terra_boi/version.rb

@@ -1,3 +1,3 @@
 module TerraBoi
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terra_boi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Charlie Reese
@@ -49,6 +49,7 @@ files:
 - lib/generators/extensions.rb
 - lib/generators/terra_boi/boilerplate_generator.rb
 - lib/generators/terra_boi/data_generator.rb
+- lib/generators/terra_boi/db_config_generator.rb
 - lib/generators/terra_boi/dockerfile_generator.rb
 - lib/generators/terra_boi/host_initializer_generator.rb
 - lib/generators/terra_boi/packer_generator.rb
@@ -56,6 +57,7 @@ files:
 - lib/generators/terra_boi/templates/Dockerfile.erb
 - lib/generators/terra_boi/templates/data_main.erb
 - lib/generators/terra_boi/templates/data_output.erb
+- lib/generators/terra_boi/templates/db_config.erb
 - lib/generators/terra_boi/templates/host_initializer.erb
 - lib/generators/terra_boi/templates/packer_ami_build.erb
 - lib/generators/terra_boi/templates/packer_application.erb