conjure 0.2.3 → 0.2.4

data/History.md

@@ -1,3 +1,9 @@
+### Version 0.2.4
+2014-8-29
+
+* Update to latest DigitalOcean Docker image ID
+* Generate minimal secrets.yml when provisioning
+
 ### Version 0.2.3
 2014-3-28
 

data/lib/conjure/provision/docker/host.rb

@@ -0,0 +1,32 @@
+module Conjure
+  module Provision
+    module Docker
+      class Host
+        def initialize(platform)
+          @platform = platform
+        end
+
+        def built_image_name(dockerfile_directory)
+          result = @platform.with_directory(dockerfile_directory) do |remote_dir|
+            @platform.run "docker build #{remote_dir}"
+          end
+          if match = result.match(/Successfully built ([0-9a-z]+)/)
+            match[1]
+          else
+            raise "Failed to build Docker image, output was #{result}"
+          end
+        end
+
+        def started_container_id(image_name, daemon_command, run_options = nil)
+          all_options = "-d #{run_options.to_s} #{image_name} #{daemon_command}"
+          @platform.run("docker run #{all_options}").strip
+        end
+
+        def container_ip_address(container_id)
+          format = "{{ .NetworkSettings.IPAddress }}"
+          @platform.run("docker inspect --format '#{format}' #{container_id}").strip
+        end
+      end
+    end
+  end
+end

data/lib/conjure/provision/docker/image.rb

@@ -0,0 +1,22 @@
+module Conjure
+  module Provision
+    module Docker
+      class Image
+        attr_reader :image_name
+
+        def initialize(docker_host, image_name)
+          @docker_host = docker_host
+          @name = image_name
+        end
+
+        def start(command, options = {})
+          container_id = @docker_host.started_container_id @name, command, options[:run_options]
+          sleep 2
+          ip_address = @docker_host.container_ip_address container_id
+          raise "Container failed to start" unless ip_address.present?
+          ip_address
+        end
+      end
+    end
+  end
+end

data/lib/conjure/provision/docker/template.rb

@@ -0,0 +1,50 @@
+require "conjure/provision/docker/host"
+require "conjure/provision/docker/image"
+
+module Conjure
+  module Provision
+    module Docker
+      class Template
+        def initialize(base_image_name)
+          @commands = ["FROM #{base_image_name}"]
+          @file_data = {}
+        end
+
+        def add_file(filename, remote_name)
+          add_file_data File.read(filename), remote_name
+        end
+
+        def add_file_data(data, remote_name)
+          local_name = "file#{@file_data.length+1}"
+          @file_data[local_name] = data
+          @commands << "ADD #{local_name} #{remote_name}"
+        end
+
+        def run(command)
+          @commands << "RUN #{command}"
+        end
+
+        def source
+          @commands.join "\n"
+        end
+
+        def prepare_build_directory(&block)
+          Dir.mktmpdir do |dir|
+            @file_data.merge("Dockerfile" => source).each do |filename, data|
+              File.write "#{dir}/#{filename}", data
+            end
+            yield dir
+          end
+        end
+
+        def build(platform)
+          docker_host = Host.new(platform)
+          image_name = prepare_build_directory do |dir|
+            docker_host.built_image_name dir
+          end
+          Image.new docker_host, image_name
+        end
+      end
+    end
+  end
+end

data/lib/conjure/provision/instance.rb

@@ -1,4 +1,7 @@
-require "conjure/provision/dockerfile"
+require "conjure/provision/docker/template"
+require "conjure/provision/local_docker"
+require "conjure/provision/postgres"
+require "yaml"
 
 module Conjure
   module Provision
@@ -8,69 +11,37 @@ module Conjure
         @rails_env = rails_env
       end
 
-      def provision
-        server = Server.create "#{@app_name}-#{@rails_env}"
+      def provision(options = {})
+        if options[:local]
+          platform = LocalDocker.new
+        else
+          platform = Server.create "#{@app_name}-#{@rails_env}"
+        end
 
-        db_password = new_db_password
-        postgres_image = postgres_dockerfile(db_password).build(server)
-        db_ip_address = postgres_image.start("/sbin/my_init")
+        database = Postgres.new(platform)
+        database.start
 
-        passenger_image = passenger_dockerfile(db_ip_address, db_password).build(server)
-        passenger_image.start("/sbin/my_init", :run_options => "-p 80:80 -p 2222:22")
+        webserver = Passenger.new(platform, database, @rails_env)
+        webserver.start
+        passenger_ip = webserver.ip_address
 
-        host = "root@#{server.ip_address} -p 2222"
+        port = platform.ip_address ? "2222" : "22"
+        ip_address = platform.ip_address || passenger_ip
+
+        host = "root@#{ip_address} -p #{port}"
+
+        sleep 1
         remote_command host, "/etc/init.d/nginx restart"
         {
-          :ip_address => server.ip_address,
-          :port => "2222",
+          :ip_address => ip_address,
+          :port => port,
           :user => "app",
           :rails_env => @rails_env
         }
       end
 
-      def postgres_dockerfile(db_password)
-        file = Dockerfile.new("conjure/postgres93:1.0.0")
-        file.run "echo \"ALTER USER db PASSWORD '#{db_password}'\" >/tmp/setpass"
-        file.run "/sbin/my_init -- /sbin/setuser postgres sh -c \"sleep 1; psql -f /tmp/setpass\""
-        file.run "rm /tmp/setpass"
-        file.run "/sbin/my_init -- /sbin/setuser db sh -c \"sleep 1; /usr/bin/createdb #{database_name}\""
-        file
-      end
-
-      def passenger_dockerfile(db_ip_address, db_password)
-        public_key = File.expand_path("~/.ssh/id_rsa.pub")
-        raise "Error: ~/.ssh/id_rsa.pub must exist." unless File.exist?(public_key)
-        file = Dockerfile.new("conjure/passenger-ruby21:1.0.1")
-        file.add_file public_key, "/root/.ssh/authorized_keys"
-        file.add_file public_key, "/home/app/.ssh/authorized_keys"
-        file.run "chown app.app /home/app/.ssh/authorized_keys"
-        file.run "chown root.root /root/.ssh/authorized_keys"
-        file.add_file_data application_conf, "/etc/nginx/sites-enabled/application.conf"
-        file.add_file_data database_yml(db_ip_address, db_password), "/home/app/application/shared/config/database.yml"
-        file
-      end
-
-      def new_db_password
-        require "securerandom"
-        SecureRandom.urlsafe_base64 20
-      end
-
-      def database_name
-        "#{@app_name}_#{@rails_env}"
-      end
-
-      def database_yml(db_ip_address, db_password)
-        require "yaml"
-        {@rails_env => {"adapter" => "postgresql", "database" => database_name, "host" => db_ip_address, "username" => "db", "password" => db_password, "template" => "template0"}}.to_yaml
-      end
-
-      def application_conf
-        options = {listen: "80", root: "/home/app/application/current/public", passenger_enabled: "on", passenger_user: "app", passenger_ruby: "/usr/bin/ruby2.1", passenger_app_env: @rails_env}
-        "server {" + options.map{|k, v| "  #{k} #{v};"}.join("\n") + "}\n"
-      end
-
       def remote_command(host, command)
-        `ssh -o StrictHostKeyChecking=no #{host} #{command}`
+        `ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no #{host} #{command}`
       end
     end
   end

data/lib/conjure/provision/local_docker.rb

@@ -0,0 +1,16 @@
+module Conjure
+  module Provision
+    class LocalDocker
+      def run(command)
+        `#{command}`
+      end
+
+      def with_directory(path)
+        yield path
+      end
+
+      def ip_address
+      end
+    end
+  end
+end

data/lib/conjure/provision/passenger.rb

@@ -0,0 +1,60 @@
+require "conjure/provision/docker/template"
+require "securerandom"
+
+module Conjure
+  module Provision
+    class Passenger
+      attr_reader :ip_address
+
+      def initialize(platform, database, rails_env)
+        @platform = platform
+        @database = database
+        @rails_env = rails_env
+      end
+
+      def start 
+        @ip_address = dockerfile.build(@platform).start("/sbin/my_init", start_options)
+      end
+
+      private
+
+      def start_options
+        {:run_options => "-p 80:80 -p 2222:22"}
+      end
+
+      def dockerfile
+        public_key = File.expand_path("~/.ssh/id_rsa.pub")
+        raise "Error: ~/.ssh/id_rsa.pub must exist." unless File.exist?(public_key)
+        file = Docker::Template.new("conjure/passenger-ruby21:1.0.1")
+        file.add_file public_key, "/root/.ssh/authorized_keys"
+        file.add_file public_key, "/home/app/.ssh/authorized_keys"
+        file.run "chown app.app /home/app/.ssh/authorized_keys"
+        file.run "chown root.root /root/.ssh/authorized_keys"
+        file.add_file_data nginx_conf, "/etc/nginx/sites-enabled/application.conf"
+        file.add_file_data database_yml, "/home/app/application/shared/config/database.yml"
+        file.add_file_data secrets_yml, "/home/app/application/shared/config/secrets.yml"
+        file
+      end
+
+      def database_yml
+        {@rails_env => @database.rails_config}.to_yaml
+      end
+
+      def secrets_yml
+        {@rails_env => {"secret_key_base" => SecureRandom.hex(64)}}.to_yaml
+      end
+
+      def nginx_conf
+        options = {
+          :listen => "80",
+          :root => "/home/app/application/current/public",
+          :passenger_enabled => "on",
+          :passenger_user => "app",
+          :passenger_ruby => "/usr/bin/ruby2.1",
+          :passenger_app_env => @rails_env,
+        }
+        "server {" + options.map{|k, v| "  #{k} #{v};"}.join("\n") + "}\n"
+      end
+    end
+  end
+end

data/lib/conjure/provision/postgres.rb

@@ -0,0 +1,44 @@
+require "conjure/provision/docker/template"
+require "securerandom"
+
+module Conjure
+  module Provision
+    class Postgres
+      def initialize(platform)
+        @platform = platform
+        @name = "conjure_db_#{SecureRandom.hex 8}"
+        @password = new_password
+      end
+
+      def start
+        @ip_address = dockerfile.build(@platform).start("/sbin/my_init")
+      end
+
+      def rails_config
+        {
+          "adapter" => "postgresql",
+          "database" => @name,
+          "host" => @ip_address,
+          "username" => "db",
+          "password" => @password,
+          "template" => "template0",
+        }
+      end
+
+      private
+
+      def dockerfile
+        file = Docker::Template.new("conjure/postgres93:1.0.0")
+        file.run "echo \"ALTER USER db PASSWORD '#{@password}'\" >/tmp/setpass"
+        file.run "/sbin/my_init -- /sbin/setuser postgres sh -c \"sleep 1; psql -f /tmp/setpass\""
+        file.run "rm /tmp/setpass"
+        file.run "/sbin/my_init -- /sbin/setuser db sh -c \"sleep 1; /usr/bin/createdb #{@name}\""
+        file
+      end
+
+      def new_password
+        SecureRandom.urlsafe_base64 20
+      end
+    end
+  end
+end

data/lib/conjure/provision/server.rb

@@ -1,3 +1,5 @@
+require "securerandom"
+
 module Conjure
   module Provision
     class Server
@@ -55,7 +57,7 @@ module Conjure
           :name => name,
           :flavor_id =>  "66",
           :region_id => "4",
-          :image_id => "2158507",
+          :image_id => "5506141",
           :private_key_path => "#{ssh_dir}/id_rsa",
           :public_key_path => "#{ssh_dir}/id_rsa.pub",
         }
@@ -66,9 +68,20 @@ module Conjure
       end
 
       def self.uniquify(server_name)
-        require "securerandom"
         "#{server_name}-#{SecureRandom.hex 4}"
       end
+
+      def with_directory(local_path, &block)
+        local_archive = remote_archive = "/tmp/archive.tar.gz"
+        remote_path = "/tmp/unpacked_archive"
+        `cd #{local_path}; tar czf #{local_archive} *`
+        send_file local_archive, remote_archive
+        run "mkdir #{remote_path}; cd #{remote_path}; tar mxzf #{remote_archive}"
+        yield remote_path
+      ensure
+        `rm #{local_archive}`
+        run "rm -Rf #{remote_path} #{remote_archive}"
+      end
     end
   end
 end

data/lib/conjure/version.rb

@@ -1,3 +1,3 @@
 module Conjure
-  VERSION = "0.2.3" unless defined?(VERSION)
+  VERSION = "0.2.4" unless defined?(VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjure
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -127,8 +127,12 @@ files:
 - lib/conjure/identity.rb
 - lib/conjure/provision/server.rb
 - lib/conjure/provision/instance.rb
-- lib/conjure/provision/docker_image.rb
-- lib/conjure/provision/dockerfile.rb
+- lib/conjure/provision/passenger.rb
+- lib/conjure/provision/postgres.rb
+- lib/conjure/provision/docker/host.rb
+- lib/conjure/provision/docker/template.rb
+- lib/conjure/provision/docker/image.rb
+- lib/conjure/provision/local_docker.rb
 - lib/conjure/command.rb
 - lib/conjure/data_set.rb
 - lib/conjure/service/digital_ocean_account.rb
@@ -177,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: Magically powerful deployment for Rails applications

data/lib/conjure/provision/docker_image.rb

@@ -1,20 +0,0 @@
-module Conjure
-  module Provision
-    class DockerImage
-      attr_reader :image_name
-
-      def initialize(server, base_image_name)
-        @server = server
-        @image_name = base_image_name
-      end
-
-      def start(shell_command, options = {})
-        container_id = @server.run("docker run -d #{options[:run_options].to_s} #{image_name} #{shell_command}").strip
-        sleep 2
-        ip_address = @server.run("docker inspect -format '{{ .NetworkSettings.IPAddress }}' #{container_id}").strip
-        raise "Container failed to start" unless ip_address.present?
-        ip_address
-      end
-    end
-  end
-end

data/lib/conjure/provision/dockerfile.rb

@@ -1,62 +0,0 @@
-require "conjure/provision/docker_image"
-
-module Conjure
-  module Provision
-    class Dockerfile
-      def initialize(base_image_name)
-        @commands = ["FROM #{base_image_name}"]
-        @file_data = {}
-      end
-
-      def add_file(filename, remote_name)
-        add_file_data File.read(filename), remote_name
-      end
-
-      def add_file_data(data, remote_name)
-        local_name = "file#{@file_data.length+1}"
-        @file_data[local_name] = data
-        @commands << "ADD #{local_name} #{remote_name}"
-      end
-
-      def run(command)
-        @commands << "RUN #{command}"
-      end
-
-      def source
-        @commands.join "\n"
-      end
-
-      def prepare_build_directory(&block)
-        Dir.mktmpdir do |dir|
-          @file_data.merge("Dockerfile" => source).each do |filename, data|
-            File.write "#{dir}/#{filename}", data
-          end
-          yield dir
-        end
-      end
-
-      def upload_build_directory(server, &block)
-        archive = "/tmp/dockerfile.tar.gz"
-        build_dir = "/tmp/docker_build"
-        prepare_build_directory do |dir|
-          `cd #{dir}; tar czf #{archive} *`
-          server.send_file archive, "dockerfile.tar.gz"
-          server.run "mkdir #{build_dir}; cd #{build_dir}; tar mxzf ~/dockerfile.tar.gz"
-          result = yield "/tmp/docker_build"
-          server.run "rm -Rf #{build_dir} ~/dockerfile.tar.gz"
-          `rm #{archive}`
-          result
-        end
-      end
-
-      def build(server)
-        result = upload_build_directory(server) { |dir| server.run "docker build #{dir}" }
-        if match = result.match(/Successfully built ([0-9a-z]+)/)
-          DockerImage.new server, match[1]
-        else
-          raise "Failed to build Docker image, output was #{result}"
-        end
-      end
-    end
-  end
-end