docker_houston 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8385fd21082fdd57412381955b2c3656e09eb393
-  data.tar.gz: 6c061aeb84b85f3ce4ccb8f4e450edeeeffca141
+  metadata.gz: b31e55cc510552a411c10015a01b4018a8f454ec
+  data.tar.gz: 656916f767d3b046b97fbb2ec974d2d58c56272b
 SHA512:
-  metadata.gz: ebaa7a377aef0880deeafa8bab9deec70516c537a8bf11b4dd78683fbfdc9bdd69d68c6bee2c7ed3170c37757b9854b412c64422a39af7fe65214ca5fae7d935
-  data.tar.gz: 287926ec8a900b78eba0e4c34e691bb9f26670826d2f4434b6f1fb840ab1877ae3c3201c5363f7eef869e72d7e28ed66549c1e7feba8676ade40c425048d2f4c
+  metadata.gz: 26b89983f5b668b2add7bf263a8dd2d4de678b83ba5905b49c2a2191179c45aa1d0e3ee425a80e34b6b54bf91b372ff42b5ad20ed76d01603aea6e2120b5f444
+  data.tar.gz: c9ed3230605b38187ea0c3133f6fd7806eca8ca14375e07f2ddae44b1f16ac3e304a303ccd089f2a761f5ebe91d747a1a802e3c6f20831e648ac35dbcc384c89

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+*.gem

data/README.md

@@ -49,11 +49,11 @@ rails g docker_houston:install APP_NAME APP_DOMAIN DOCKER_HOST
 
 ```
 
-APP_NAME: the app name for your project.
+`APP_NAME`: the app name for your project.
 
-APP_DOMAIN: the virtual url for the app.
+`APP_DOMAIN`: the virtual url for the app.
 
-DOCKER_HOST: the remote host for docker instance.
+`DOCKER_HOST`: the remote host for docker instance.
 
 
 ###Make `bin/docker` executable

data/lib/docker_houston/capistrano.rb

@@ -21,7 +21,7 @@ def exec_on_remote(command, message="Executing command on remote...", container_
   on roles :app do |server|
     ssh_cmd = "ssh -A -t #{server.user}@#{server.hostname}"
     puts message
-    exec "#{ssh_cmd} 'cd #{fetch(:release_dir)} && docker-compose -p #{fetch(:app_with_stage)} run web #{command}'"
+    exec "#{ssh_cmd} 'cd #{fetch(:release_dir)} && docker-compose -f docker-compose.yml -f docker-compose.prod.yml -p #{fetch(:app_with_stage)} run web #{command}'"
   end
 end
 
@@ -48,7 +48,7 @@ namespace :docker do
   task :lift_off do
     on roles :app do
       invoke 'deploy'
-      invoke 'docker:setup_db'
+      invoke 'docker:setup_env'
       invoke 'docker:build_container'
       invoke 'docker:stop'
       invoke 'docker:start'
@@ -58,12 +58,13 @@ namespace :docker do
     end
   end
 
-  desc 'relink docker database'
-  task :setup_db do
+  desc 'Setup Environment file'
+  task :setup_env do
     on roles :app do
-      docker_db = "#{fetch(:release_dir)}/config/database.yml.docker"
-      if test "[ -f #{docker_db} ]"
-        execute :cp, "#{docker_db} #{docker_db.chomp('.docker')}"
+      env_file = "#{fetch(:shared_dir)}/.env"
+      unless test "[ -f #{env_file} ]"
+        require 'securerandom'
+        execute :echo, "'VIRTUAL_HOST=#{fetch(:app_domain)}\nSECRET_KEY_BASE=#{SecureRandom.hex(64)}' > #{env_file}"
       end
     end
   end
@@ -72,7 +73,7 @@ namespace :docker do
   task :build_container do
     on roles :app do
       within fetch(:release_dir) do
-        execute "cd #{fetch(:release_dir)} && docker-compose -p #{fetch(:app_with_stage)} build web"
+        execute "cd #{fetch(:release_dir)} && docker-compose -f docker-compose.yml -f docker-compose.prod.yml -p #{fetch(:app_with_stage)} build web"
       end
     end
   end
@@ -81,7 +82,7 @@ namespace :docker do
   task :start do
     on roles :app do
       within fetch(:release_dir) do
-        execute "cd #{fetch(:release_dir)} && docker-compose -p #{fetch(:app_with_stage)} up -d"
+        execute "cd #{fetch(:release_dir)} && docker-compose -f docker-compose.yml -f docker-compose.prod.yml -p #{fetch(:app_with_stage)} up -d"
       end
     end
   end
@@ -90,8 +91,8 @@ namespace :docker do
   task :stop do
     on roles :app do
       within fetch(:release_dir) do
-        execute "cd #{fetch(:release_dir)} && docker-compose -p #{fetch(:app_with_stage)} kill" # kill the running containers
-        execute "cd #{fetch(:release_dir)} && docker-compose -p #{fetch(:app_with_stage)} rm --force"
+        execute "cd #{fetch(:release_dir)} && docker-compose -f docker-compose.yml -f docker-compose.prod.yml -p #{fetch(:app_with_stage)} kill" # kill the running containers
+        execute "cd #{fetch(:release_dir)} && docker-compose -f docker-compose.yml -f docker-compose.prod.yml -p #{fetch(:app_with_stage)} rm --force"
       end
     end
   end

data/lib/docker_houston/version.rb

@@ -1,3 +1,3 @@
 module DockerHouston
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/generators/docker_houston/install_generator.rb

@@ -6,8 +6,8 @@ module DockerHouston
     class InstallGenerator < Rails::Generators::Base
 
       argument :app_name, type: :string, default: Rails.application.class.parent_name.downcase
-      argument :app_domain, type: :string, default: "YOUR-APP-HOST-NAME"
-      argument :docker_host, type: :string, default: "YOUR-DOCKER_HOST"
+      argument :app_domain, type: :string, default: "example.com"
+      argument :docker_host, type: :string, default: "example.com"
 
       source_root File.expand_path("../../templates", __FILE__)
       desc "Creates a docker configuration template files to your application."
@@ -16,8 +16,10 @@ module DockerHouston
         copy_file "Dockerfile.erb", "Dockerfile"
       end
 
-      def copy_docker_compse
-        template "docker-compose.yml.erb", "docker-compose.yml"
+      def copy_docker_compose
+        copy_file "docker-compose.yml.erb", "docker-compose.yml"
+        copy_file "docker-compose.override.yml.erb", "docker-compose.override.yml"
+        template "docker-compose.prod.yml.erb", "docker-compose.prod.yml"
       end
 
       def copy_secret
@@ -25,15 +27,20 @@ module DockerHouston
       end
 
       def copy_database_file
-        template "database.yml.docker.erb", "config/database.yml.docker"
+        template "database.yml.erb", "config/database.yml"
       end
 
       def copy_unicorn
         copy_file "unicorn.rb", "config/unicorn.rb"
       end
 
-      def copy_capistrano_staging
-        template 'staging.rb.erb', "config/deploy/staging.rb"
+      def copy_capistrano_env
+        environment = ask("Staging or production? [staging]")
+        if environment.blank? || environment == 'staging'
+          template 'staging.rb.erb', "config/deploy/staging.rb"
+        else
+          template 'production.rb.erb', "config/deploy/production.rb"
+        end
       end
 
       def copy_capistrano_deploy

data/lib/generators/templates/Dockerfile.erb

@@ -1,53 +1,20 @@
 FROM ruby:2.3.0
 
-RUN apt-get update -y
-
-RUN apt-get install -y wget curl \
-    build-essential git git-core \
-    zlib1g-dev libssl-dev libreadline-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev
-
-RUN apt-get install -y software-properties-common
+RUN apt-get update && apt-get install -y \ 
+  build-essential \ 
+  nodejs
 
 RUN apt-get dist-upgrade -y
 
 # Add options to gemrc
 RUN echo "gem: --no-document" > ~/.gemrc
 
-RUN gem install bundler
-
-ENV BUNDLE_GEMFILE=/app/Gemfile
-ENV BUNDLE_JOBS=2
-ENV BUNDLE_PATH=/bundle
-ENV BUNDLE_WITHOUT=development:test
-
-WORKDIR /tmp
-
 RUN mkdir /app
+WORKDIR /app
 
-RUN mkdir /app/.bundle
-RUN echo 'BUNDLE_WITHOUT: development:test' > /app/.bundle/config
-
-RUN gem install backup -v 4.2.2 --no-ri --no-rdoc
-RUN mkdir /backups
-
-RUN rm /etc/default/rcS && touch /etc/default/rcS
-RUN echo "UTC=no" >> /etc/default/rcS
-RUN cp /etc/localtime /etc/localtime.bkp
-RUN rm /etc/localtime
-RUN ln -s /usr/share/zoneinfo/Pacific/Auckland /etc/localtime
-
-# RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main' >> /etc/apt/sources.list
-# RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
-# RUN apt-get update
-# RUN apt-get install -y postgresql-9.4
-# RUN apt-get remove -y postgresql-client-9.3
-# COPY . /app
+ADD Gemfile Gemfile.lock ./
+RUN gem install bundler && bundle install --jobs 20 --retry 5
 
-WORKDIR /app
-ADD Gemfile /app/Gemfile
-ADD Gemfile.lock /app/Gemfile.lock
-RUN bundle install
-ADD . /app
+ADD . ./
 
-RUN mkdir -p log
-RUN touch log/cron.stdout.log && touch log/cron.stderr.log
+EXPOSE 3000

data/lib/generators/templates/{database.yml.docker.erb → database.yml.erb}

@@ -1,10 +1,8 @@
 default: &default
   adapter: postgresql
   encoding: unicode
-  username: docker
-  password: docker
   pool: 5
-  host: postgresql
+  host: db
 
 development:
   <<: *default
@@ -14,6 +12,10 @@ staging:
   <<: *default
   database: <%= app_name %>_staging
 
+production:
+  <<: *default
+  database: <%= app_name %>_production
+
 test:
   <<: *default
   database: <%= app_name %>_test

data/lib/generators/templates/deploy.rb.erb

@@ -1,5 +1,5 @@
 # config valid only for current version of Capistrano
-lock '3.4.0'
+lock '3.8.0'
 
 set :branch, fetch(:branch, 'master')
 set :application, "<%= app_name %>"

data/lib/generators/templates/docker-compose.override.yml.erb

@@ -0,0 +1,9 @@
+version: '2'
+services: 
+  db:
+    volumes:
+      - ./db/data:/var/lib/postgresql/data
+  web:
+    volumes:
+      - .:/app
+    env_file: .env

data/lib/generators/templates/docker-compose.prod.yml.erb

@@ -0,0 +1,12 @@
+version: '2'
+services:
+  db:
+    volumes:
+      - /home/deploy/db/data:/var/lib/postgresql/data
+  web:
+    volumes:
+      - /home/deploy/dockerised_apps/nginx-proxy/assets/<%= app_domain %>/public:/app/public/
+      - /home/deploy/dockerised_apps/logs/deploybot/:/app/log/
+      - /home/deploy/dockerised_apps/logs/deploybot/unicorn:/var/log/
+    env_file: ../../shared/.env
+    command: ./bin/docker

data/lib/generators/templates/docker-compose.yml.erb

@@ -1,26 +1,11 @@
-postgresql:
-  image: postgres
-  ports:
-    - 5432
-  volumes:
-    - /home/deploy/db/data:/var/lib/postgresql/data
-  environment: &postgres
-    POSTGRES_USER: docker
-    POSTGRES_PASSWORD: docker
-web:
-  build: .
-  volumes:
-    - /home/deploy/dockerised_apps/nginx-proxy/assets/<%= app_domain %>/public:/app/public/
-    - /home/deploy/dockerised_apps/logs/<%= app_name %>/:/app/log/
-    - /home/deploy/dockerised_apps/logs/<%= app_name %>/unicorn:/var/log/
-  ports:
-    - "3000"
-  links:
-    - postgresql
-  environment: &web
-    RAILS_ENV: staging
-    SECRET_KEY_BASE: 43834f4b48946cb62b30130a4577cec2d0a842fcf97095706ccf0de7f293689336c1c0f84a55a26a689ca8ca21edd6da477a9ba9adce48176fe0b23e17f16fd4
-    VIRTUAL_HOST: <%= app_domain %>
-    <<: *postgres
-  # env_file: ../shared/.env
-  command: ./bin/docker
+version: '2'
+services: 
+  db:
+    image: postgres
+  web:
+    build: .
+    ports:
+      - "3000:3000"
+    depends_on:
+      - db
+    command: bundle exec rails server -b 0.0.0.0 --pid /tmp/server.pid

data/lib/generators/templates/production.rb.erb

@@ -0,0 +1,10 @@
+role :web,        "<%= @docker_host %>"
+role :app,        "<%= @docker_host %>"
+
+set :app_name,  "<%= @app_name %>"
+
+set :rails_env, "production"
+server "<%= @docker_host %>", user: 'deploy', roles: [:app, :install]
+set :working_dir, "/home/deploy/dockerised_apps/#{fetch(:app_name)}/current"
+set :deploy_to, "#{fetch(:working_dir).chomp('current')}"
+set :release_dir, ->{Pathname.new("/home/deploy/dockerised_apps/#{fetch(:app_name)}/current")}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_houston
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - alex-zige
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,9 +82,12 @@ files:
 - lib/generators/docker_houston/install_generator.rb
 - lib/generators/templates/Capfile
 - lib/generators/templates/Dockerfile.erb
-- lib/generators/templates/database.yml.docker.erb
+- lib/generators/templates/database.yml.erb
 - lib/generators/templates/deploy.rb.erb
+- lib/generators/templates/docker-compose.override.yml.erb
+- lib/generators/templates/docker-compose.prod.yml.erb
 - lib/generators/templates/docker-compose.yml.erb
+- lib/generators/templates/production.rb.erb
 - lib/generators/templates/secrets.yml
 - lib/generators/templates/staging.rb.erb
 - lib/generators/templates/unicorn.rb
@@ -111,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Misson Control for docker builds.