ruby_yacht 0.3.0 → 0.4.0

data/lib/ruby_yacht/dsl/{app_type.rb → server_type.rb}

@@ -1,69 +1,72 @@
 module RubyYacht
-  # This class represents a type of app that the user can configure.
+  # This class represents a type of server that the user can configure.
   #
-  # An app type corresponds to a major app framework, like Ruby on Rails. App
-  # types are defined by plugins, which also provide the logic for installing
-  # and running the apps.
+  # An server type corresponds to a major server framework, like Ruby on Rails.
+  # Server types are defined by plugins, which also provide the logic for
+  # installing and running the server.
   #
-  # You can configure this with RubyYacht::AppType::DSL
-  class AppType
+  # You can configure this with RubyYacht::ServerType::DSL
+  class ServerType
     # The name of the type.
     attr_accessor :name
 
-    # The attributes that we define on the project DSL once this app type has
+    # The type of container that this should be applied to.
+    attr_accessor :container_type
+
+    # The attributes that we define on the project DSL once this server type has
     # been loaded.
     #
     # Each entry will be a hash with a key for `name`, and optionally a key for
     # `default` and `required`. These values will be given to the
     # `add_attribute` method in the project DSL.
     #
-    # The attribute names will be prefixed with the app type's name. For
-    # instance, if the `rails` app type provides an `environment` attribute,
+    # The attribute names will be prefixed with the server type's name. For
+    # instance, if the `rails` server type provides an `environment` attribute,
     # it will be called `rails_environment` on the project's DSL. This prevents
     # conflicts with attributes from other plugins.
     attr_accessor :project_attributes
     
-    # The attributes that we define on the app DSL once this app type has
+    # The attributes that we define on the server DSL once this server type has
     # been loaded.
     #
     # Each entry will be a hash with a key for `name`, and optionally a key for
     # `default` and `required`. These values will be given to the
     # `add_attribute` method in the project DSL.
     #
-    # The attributes will only be defined on apps with this app type.
+    # The attributes will only be defined on servers with this server type.
     #
-    # The attribute names will be prefixed with the app type's name. For
-    # instance, if the `rails` app type provides an `environment` attribute,
-    # it will be called `rails_environment` on the app's DSL. This prevents
+    # The attribute names will be prefixed with the server type's name. For
+    # instance, if the `rails` server type provides an `environment` attribute,
+    # it will be called `rails_environment` on the server's DSL. This prevents
     # conflicts with attributes from other plugins.
-    attr_accessor :app_attributes
+    attr_accessor :server_attributes
 
-    # The docker image that we use as the source for the app images.
+    # The docker image that we use as the source for the server images.
     attr_accessor :baseline_image
 
-    # The custom environment variables that we set in the images for this app
+    # The custom environment variables that we set in the images for this server
     # type.
     #
     # Each entry will be a hash with the following keys:
     #
     # * **name: String**    The name of the environment variable
-    # * **image: String**   The type of image that this is set in (e.g. app
+    # * **image: String**   The type of image that this is set in (e.g. server
     #                       or database).
     # * **block**           A block that will be called inside the Dockerfile
     #                       ERB for providing the value of the environment
     #                       variable.
     attr_accessor :environment_variables
 
-    # This class provides a DSL for configuring a RubyYacht::AppType.
+    # This class provides a DSL for configuring a RubyYacht::ServerType.
     class DSL
       include RubyYacht::DSL::Base
       extend RubyYacht::DSL::Base::ClassMethods
 
-      # This initiailzer creates the app type DSL.
+      # This initiailzer creates the server type DSL.
       #
       # ### Parameters
       #
-      # * **name: Symbol**    The name of the app type.
+      # * **name: Symbol**    The name of the server type.
       def initialize(name)
         @name = name
         @environment_variables = []
@@ -72,10 +75,16 @@ module RubyYacht
 
       add_attribute :name
 
+      #
+      # :method: container_type
+      # You can call `container_type :app` to say that this server type is for
+      # apps. Other acceptable values are `database` and `web`.
+      add_attribute :container_type
+
       #
       # :method: baseline_image
       # You can call `baseline_image 'ubuntu'` to use ubuntu as the source
-      # image for the app containers for this app type.
+      # image for the server containers for this server type.
       add_attribute :baseline_image
 
       #
@@ -85,13 +94,14 @@ module RubyYacht
       add_list :project_attribute
 
       #
-      # :method: app_attribute
-      # You can call `app_attribute name: :environment, default: 'staging'`
+      # :method: server_attribute
+      # You can call `server_attribute name: :environment, default: 'staging'`
       # to add an attribute to the app DSL.
-      add_list :app_attribute
+      add_list :server_attribute
 
-      creates_object RubyYacht::AppType, [:name, :baseline_image,
-        :project_attributes, :app_attributes, :environment_variables]
+      creates_object RubyYacht::ServerType, [:name, :baseline_image,
+        :container_type, :project_attributes, :server_attributes,
+        :environment_variables]
 
       # This method defines a new environment variable set for this app type.
       #
@@ -102,8 +112,8 @@ module RubyYacht
       # * **name: String**    The name of the environment variable.
       # * **block**           A block for generating the environment variable.
       #                       This will have access to the project (as @project)
-      #                       and the app (as @app) that we are building the
-      #                       image for.
+      #                       and the server (as @server) that we are building
+      #                       the image for.
       def environment_variable(image, name, &block)
         @environment_variables << {image: image, name: name, block: block}
       end

data/lib/ruby_yacht/dsl.rb

@@ -5,4 +5,4 @@ require 'ruby_yacht/dsl/app'
 require 'ruby_yacht/dsl/database'
 require 'ruby_yacht/dsl/dns_server'
 require 'ruby_yacht/dsl/hook'
-require 'ruby_yacht/dsl/app_type'
+require 'ruby_yacht/dsl/server_type'

data/lib/ruby_yacht/images/app/Dockerfile.erb

@@ -1,9 +1,13 @@
-FROM <%= @project.system_prefix %>-<%= @app.app_type %>-app-dependencies
+FROM <%= @project.system_prefix %>-<%= @app.server_type %>-app-dependencies
 
-ENV DATABASE_HOST <%= @project.database.host %>
-ENV DATABASE_NAME <%= @project.database.name %>
-ENV DATABASE_PASSWORD <%= @project.database.password %>
-ENV DATABASE_USERNAME <%= @project.database.username %>
+<% database = @app.database(@project) %>
+<% if database %>
+ENV DATABASE_HOST <%= database.local? ? database.container_name(@project) : database.host %>
+ENV DATABASE_NAME <%= database.name %>
+ENV DATABASE_PASSWORD <%= database.password %>
+ENV DATABASE_USERNAME <%= database.username %>
+ENV DATABASE_TYPE <%= database.server_type %>
+<% end %>
 ENV APP_PORT <%= @app.port %>
 ENV REPOSITORY_HOST <%= @project.repository %>
 ENV REPOSITORY_NAME <%= @app.repository_name %>

data/lib/ruby_yacht/images/app-dependencies/Dockerfile.erb

@@ -4,7 +4,7 @@
 # This is a slow process, so this should be kept as simple as possible so that
 # it can remain unchanged.
 
-FROM <%= @app_type.baseline_image %>
+FROM <%= @server_type.baseline_image %>
 
 <%= include_environment_variables :app_dependencies %>
 
@@ -20,7 +20,7 @@ RUN touch /var/docker/.keep
 RUN chmod u+x /var/docker/*
 
 <% @project.apps.each do |app| %>
-<% next unless app.app_type == @app_type.name %>
+<% next unless app.server_type == @server_type.name %>
 
 RUN git clone git@<%= @project.repository %>:<%= app.repository_name %> /var/code/<%= app.name %>
 WORKDIR /var/code/<%= app.name %>

data/lib/ruby_yacht/images/database/Dockerfile.erb

@@ -1,16 +1,16 @@
-FROM <%= @project.system_prefix %>-<%= @app_type.name %>-app-dependencies
-<% database = @project.database %>
+FROM <%= @project.system_prefix %>-<%= @app_server_type.name %>-app-dependencies
 
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get install -y mysql-server
-
-ENV DATABASE_USERNAME <%= @project.database.username %>
-ENV DATABASE_PASSWORD <%= @project.database.password %>
-ENV DATABASE_NAME <%= @project.database.name %>
+ENV DATABASE_USERNAME <%= @database.username %>
+ENV DATABASE_PASSWORD <%= @database.password %>
+ENV DATABASE_NAME <%= @database.name %>
+ENV DATABASE_TYPE <%= @database.server_type %>
+<%= include_environment_variables :database %>
 <% with_each_app_type do %>
 <%= include_environment_variables :database %>
 <% end %>
 
+<%= include_event :install_libraries %>
+
 COPY setup.bash /var/docker/setup.bash
 COPY checkout.bash /var/docker/checkout.bash
 <% with_each_app_type do %>
@@ -19,10 +19,11 @@ COPY checkout.bash /var/docker/checkout.bash
 
 RUN chmod u+x /var/docker/*
 
-RUN /var/docker/setup.bash <%= database.name %> <%= database.username %> <%= database.password %>
+<%= include_event :create_databases %>
 
-<% @project.apps.each do |app| %>
-<% @app_type = RubyYacht.configuration.find_app_type(app.app_type) %>
+<% apps = @project.apps.select { |app| app.database_name == @database.name } %>
+<% apps.each do |app| %>
+<% @server_type = RubyYacht.configuration.find_server_type(app.server_type) %>
 
 RUN /var/docker/checkout.bash <%= @project.repository %> <%= app.name %> <%= app.repository_name %>
 WORKDIR /var/code/<%= app.name %>

data/lib/ruby_yacht/images/web/Dockerfile.erb

@@ -13,13 +13,17 @@ COPY index_config.erb /var/docker/index_config.erb
 COPY app_config.erb /var/docker/app_config.erb
 
 <% @projects.each do |project| %>
-<% if project.primary_app == nil %>
+<% primary_app = project.primary_app %>
+<% if project.apps.any? { |app| app.name == project.system_prefix } %>
+<% primary_app = project.system_prefix %>
+<% end %>
+<% if primary_app == nil %>
 <% app_list = project.apps.map(&:name).join(',') %>
 
 RUN ruby /var/docker/add_project.rb <%= project.system_prefix %> <%= project.domain %> <%= app_list %>
 <% end %>
 <% project.apps.each do |app| %>
-RUN ruby /var/docker/add_app.rb <%= project.system_prefix %> <%= project.domain %> <%= app.name %> <%= app.port %> <%= app.name == project.primary_app %>
+RUN ruby /var/docker/add_app.rb <%= project.system_prefix %> <%= project.domain %> <%= app.name %> <%= app.port %> <%= app.name == primary_app %>
 <% end %>
 <% end %>
 

data/lib/ruby_yacht/images/web/add_app.rb

@@ -5,7 +5,13 @@ require 'erb'
 @domain = ARGV.shift
 @app = ARGV.shift
 @port = ARGV.shift
-@container_name = "#{@project}-#{@app}"
+
+if @project == @app
+  @container_name = @project
+else
+  @container_name = "#{@project}-#{@app}"
+end
+
 @is_primary_app = ARGV.shift == 'true'
 
 File.open(File.join("/etc/nginx/conf.d/#{@container_name}.conf"), 'w') do |file|

data/lib/ruby_yacht/images/web/app_config.erb

@@ -1,3 +1,4 @@
+<% if @app != @project %>
 server {
   listen       80;
   server_name  <%= @app %>.<%= @domain %>;
@@ -9,6 +10,7 @@ server {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 }
+<% end %>
 <% if @is_primary_app %>
 server {
   listen       80;

data/lib/ruby_yacht/plugins/mysql/scripts/setup.bash

@@ -0,0 +1,11 @@
+#! /bin/bash
+
+service mysql start;
+COMMAND="CREATE USER '$DATABASE_USERNAME'@'localhost' IDENTIFIED BY '$DATABASE_PASSWORD';";
+COMMAND="$COMMAND CREATE USER '$DATABASE_USERNAME'@'%' IDENTIFIED BY '$DATABASE_PASSWORD';";
+
+COMMAND="$COMMAND GRANT ALL ON $DATABASE_NAME.* to '$DATABASE_USERNAME'@'localhost';";
+COMMAND="$COMMAND GRANT ALL ON $DATABASE_NAME.* to '$DATABASE_USERNAME'@'%';";
+COMMAND="$COMMAND CREATE DATABASE $DATABASE_NAME;";
+
+mysql -uroot -e "$COMMAND";

data/lib/ruby_yacht/plugins/mysql.rb

@@ -0,0 +1,27 @@
+module RubyYacht::Plugins
+  # This module provides the plugin for managing MySQL databases.
+  module MySQL
+    # This method loads the configuration for the MySQL plugin.
+    def self.load
+      RubyYacht.configure do
+        server_type :mysql do
+          container_type :database
+          baseline_image 'mysql'
+
+          environment_variable :database, 'DEBIAN_FRONTEND' do
+            'noninteractive'
+          end
+        end
+      end
+
+      RubyYacht.configure do
+        add_hooks(server_type: :mysql, folder: File.join(File.dirname(__FILE__), 'mysql', 'scripts')) do
+          during(:install_libraries) { command 'apt-get install -y mysql-server' }
+          during(:create_databases) { run_script 'setup.bash' }
+        end
+      end
+    end
+  end
+end
+
+RubyYacht::Plugins::MySQL.load

data/lib/ruby_yacht/plugins/rails/scripts/install_gems.rb

@@ -1,3 +1,8 @@
 #! /usr/local/bin/ruby
 
-system "bundle install"
+command = "bundle install"
+gem_groups = ENV['EXCLUDED_GEM_GROUPS']
+unless gem_groups == ''
+  command += " --without #{gem_groups}"
+end
+system command

data/lib/ruby_yacht/plugins/rails/scripts/load_seeds.rb

@@ -12,10 +12,10 @@ config_path = "./config/database.yml"
 username = ENV['DATABASE_USERNAME']
 password = ENV['DATABASE_PASSWORD']
 database = ENV['DATABASE_NAME']
-
+rails_env = ENV['RAILS_ENV']
 
 database_config = {
-  'development' => {
+  rails_env => {
     'adapter' => 'mysql2',
     'encoding' => 'utf8',
     'reconnect' => true,
@@ -33,8 +33,10 @@ end
 system "bundle install"
 tables = `mysql -uroot -e "SHOW TABLES" #{database}`
 if tables == ''
-  test_database_command = "CREATE DATABASE #{database}_test; GRANT ALL ON #{database}_test.* TO '#{username}'@'%';"
-  system "mysql -uroot -e \"#{test_database_command}\""
+  if rails_env == 'development'
+    test_database_command = "CREATE DATABASE #{database}_test; GRANT ALL ON #{database}_test.* TO '#{username}'@'%';"
+    system "mysql -uroot -e \"#{test_database_command}\""
+  end
   system "bundle exec rake db:reset"
 else
   system "bundle exec rake db:migrate; bundle exec rake db:seed"

data/lib/ruby_yacht/plugins/rails/scripts/prepare_rails_for_launch.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 system "bundle install"
 system "rake db:migrate"
 system "rails r Rails.cache.clear"
+system "rm -f tmp/pids/*"
 
 if ENV['RAILS_ENV'] != 'development'
   system "rake assets:precompile"

data/lib/ruby_yacht/plugins/rails/scripts/update_rails_config.rb

@@ -2,10 +2,6 @@
 require 'yaml'
 
 database_host = ENV['DATABASE_HOST']
-local_database = (database_host == 'localhost')
-if local_database
-  database_host = ENV['SYSTEM_PREFIX'] + '-database'
-end
   
 common_config = {
   'adapter' => 'mysql2',
@@ -20,7 +16,7 @@ database_config = {
   ENV['RAILS_ENV'] => common_config
 }
 
-if ENV['RAILS_ENV'] == 'development' && local_database
+if ENV['RAILS_ENV'] == 'development'
   database_config['test'] = common_config.dup
   database_config['test']['database'] += '_test'
 end

data/lib/ruby_yacht/plugins/rails.rb

@@ -4,26 +4,34 @@ module RubyYacht::Plugins
     # This method loads the configuration for the Rails plugin.
     def self.load
       RubyYacht.configure do
-        app_type :rails do
+        server_type :rails do
+          container_type :app
           baseline_image 'ruby:2.3'
           project_attribute name: :environment, default: 'development'
+          project_attribute name: :excluded_gem_groups, default: []
           project_attribute name: :secret_key_base
 
-          environment_variable :app, 'RAILS_ENV' do
+          environment_variable :app_dependencies, 'RAILS_ENV' do
             @project.rails_environment
           end
 
           environment_variable :app, 'SECRET_KEY_BASE' do
             @project.rails_secret_key_base
           end
+          
+          environment_variable :app_dependencies, 'EXCLUDED_GEM_GROUPS' do
+            groups = @project.rails_excluded_gem_groups.join(' ')
+            groups = '""' if groups == ''
+            groups
+          end
         end
       end
 
       RubyYacht.configure do
-        add_hooks(app_type: :rails, folder: File.join(File.dirname(__FILE__), 'rails', 'scripts')) do
+        add_hooks(server_type: :rails, folder: File.join(File.dirname(__FILE__), 'rails', 'scripts')) do
           during(:install_libraries) { run_script 'install_gems.rb' }
           
-          after(:build_checkout) { command 'bundle install && bundle clean --force' }
+          after(:build_checkout) { command 'bundle install --clean' }
           
           during(:load_database_seeds) { run_script 'load_seeds.rb' }
 

data/lib/ruby_yacht/plugins.rb

@@ -3,4 +3,5 @@ module RubyYacht
   module Plugins
   end
 end
-require 'ruby_yacht/plugins/rails'
+require 'ruby_yacht/plugins/rails'
+require 'ruby_yacht/plugins/mysql'

data/lib/ruby_yacht/runner/build_images.rb

@@ -24,21 +24,24 @@ module RubyYacht::Runner
         
         id_path = File.join(ENV['HOME'], '.ssh', 'id_rsa')
         tmp_id_path = File.join('tmp', 'id_rsa')
-        if File.exist?(id_path)
-          FileUtils.cp(id_path, tmp_id_path)
-        end
+        FileUtils.cp(id_path, tmp_id_path) if File.exist?(id_path)
       
-        project.apps.map(&:app_type).uniq.each do |type_name|
-          @app_type = RubyYacht.configuration.find_app_type(type_name)
-          build_image 'app-dependencies', "#{@project.system_prefix}-#{@app_type.name}-app-dependencies"
+        project.apps.map(&:server_type).uniq.each do |type_name|
+          @server_type = RubyYacht.configuration.find_server_type(type_name)
+          build_image 'app-dependencies', "#{@project.system_prefix}-#{@server_type.name}-app-dependencies"
         end
         
-        build_image 'database' if project.database.local?
+        project.databases.select(&:local?).each do |database|
+          @app_server_type = @server_type
+          @database = database
+          @server_type = RubyYacht.configuration.find_server_type(@database.server_type)
+          build_image 'database', @database.container_name(@project)
+        end
         
         @project.apps.each do |app|
           @app = app
-          @app_type = RubyYacht.configuration.find_app_type(@app.app_type)
-          build_image 'app', "#{@project.system_prefix}-#{app.name}"
+          @server_type = RubyYacht.configuration.find_server_type(@app.server_type)
+          build_image 'app', @app.container_name(@project)
         end
         @app = nil
       end
@@ -77,10 +80,10 @@ module RubyYacht::Runner
       set_image_settings(folder_name)
 
       @hook_events.each do |event|
-        @app_types.each do |app_type|
-          RubyYacht.configuration.fetch_hooks(app_type: app_type, event_type: event).each do |hook|
-            next unless hook.script_path
-            FileUtils.cp hook.script_path, "tmp"
+        @server_types.each do |server_type|
+          RubyYacht.configuration.fetch_hooks(server_type: server_type, event_type: event).each do |hook|
+            next unless hook.copied_file_path
+            FileUtils.cp hook.copied_file_path, "tmp"
           end
         end
       end
@@ -96,6 +99,7 @@ module RubyYacht::Runner
       end
       
       image_name ||= "#{@project.system_prefix}-#{folder_name}"
+
       docker "build -t #{image_name} tmp"
       
       FileUtils.rm(Dir[File.join("tmp", "*")])
@@ -103,7 +107,7 @@ module RubyYacht::Runner
 
     # This method establishes settings for building an image.
     #
-    # This will set the `@templates`, `@hook_events`, and `@app_types` instance
+    # This will set the `@templates`, `@hook_events`, and `@server_types` instance
     # variables.
     #
     # ### Parameters
@@ -121,14 +125,14 @@ module RubyYacht::Runner
         case folder_name
         when 'app' then [:startup, :build_checkout]
         when 'app-dependencies' then [:install_libraries]
-        when 'database' then [:load_database_seeds]
+        when 'database' then [:create_databases, :install_libraries, :load_database_seeds]
         else []
         end
         
-      @app_types =
+      @server_types =
         case folder_name
-        when 'database' then @project.apps.map(&:app_type).uniq
-        else [@app_type.name]
+        when 'database' then [@server_type.name] + @project.apps.map(&:server_type).uniq
+        else [@server_type.name]
         end
     end
 
@@ -167,7 +171,7 @@ module RubyYacht::Runner
           result += "\n"
           next
         end
-        RubyYacht.configuration.fetch_hooks(app_type: @app_type.name, event_type: event_type, event_time: time).each do |hook|
+        RubyYacht.configuration.fetch_hooks(server_type: @server_type.name, event_type: event_type, event_time: time).each do |hook|
           if options[:in_bash]
             result += "#{hook.command};\n"
           else
@@ -193,7 +197,7 @@ module RubyYacht::Runner
     # variables.
     def include_environment_variables(image_type)
       result = ""
-      @app_type.environment_variables.select { |variable| variable[:image] == image_type }.each do |variable|
+      @server_type.environment_variables.select { |variable| variable[:image] == image_type }.each do |variable|
         result += "ENV #{variable[:name]} #{instance_eval(&variable[:block])}\n"
       end
       result
@@ -211,22 +215,24 @@ module RubyYacht::Runner
     # A String with the contents of the Dockerfile for copying the script.
     def copy_hooks(event_types)
       result = ""
-      RubyYacht.configuration.fetch_hooks(app_type: @app_type.name).each do |hook|
-        next if hook.script_name == ''
+      RubyYacht.configuration.fetch_hooks(server_type: @server_type.name).each do |hook|
+        next if hook.copied_file_name == ''
         next unless event_types.include?(hook.event_type)
-        result += "COPY #{hook.script_name} /var/docker/#{hook.script_name}\n"
+        result += "COPY #{hook.copied_file_name} /var/docker/#{hook.copied_file_name}\n"
       end
       result
     end
 
     # This method goes through all the app types for the apps in the project,
-    # sets each one as the `@app_type` instance variable, and then yields to the
+    # sets each one as the `@server_type` instance variable, and then yields to the
     # block passed to the method.
     def with_each_app_type
-      @project.apps.map(&:app_type).uniq.each do |app_type|
-        @app_type = RubyYacht.configuration.find_app_type(app_type)
+      original_server_type = @server_type
+      @project.apps.map(&:server_type).uniq.each do |server_type|
+        @server_type = RubyYacht.configuration.find_server_type(server_type)
         yield
       end
+      @server_type = original_server_type
     end
   end
 end

data/lib/ruby_yacht/runner/checkout.rb

@@ -13,7 +13,7 @@ module RubyYacht::Runner
     attr_accessor :project_name
     
     # The name of the app.
-    attr_accessor :app
+    attr_accessor :app_name
 
     # The branch that we are checking out.
     attr_accessor :branch
@@ -36,13 +36,13 @@ module RubyYacht::Runner
     #
     # This will take the app name and branch from the command line.
     def parse_positional_arguments(arguments)
-      self.app = arguments.shift
+      self.app_name = arguments.shift
       self.branch = arguments.shift
     end
 
     # This method runs the logic for the command.
     def run
-      if app.nil?
+      if app_name.nil?
         log "You must provide an app name"
         log "Run #{Command.short_script_name} help checkout for more information"
         return false
@@ -56,7 +56,8 @@ module RubyYacht::Runner
       project = self.project_named(self.project_name)
       return false unless project
 
-      container_name = "#{project.system_prefix}-#{app}"
+      app = project.apps.find { |a| a.name == app_name.to_sym }
+      container_name = app.container_name(project)
       
       docker "exec #{container_name} bash -c 'cd /var/code; git fetch; git checkout .; git checkout #{branch}; git pull'"
       docker "exec #{container_name} /var/docker/before_startup.bash"

data/lib/ruby_yacht/runner/run_containers.rb

@@ -15,12 +15,9 @@ module RubyYacht::Runner
       
       projects.each do |project|
         @project = project
-        if @project.check_out_locally    
-          FileUtils.mkdir_p File.join(ENV["PWD"], '..', 'code')
-        end
         
-        if project.database.local?
-          run_container :database
+        project.databases.select(&:local?).each do |database|
+          run_container database.container_label
         end
         
         project.apps.each do |app|
@@ -70,7 +67,11 @@ module RubyYacht::Runner
     # * **name: Symbol**    The name of the container, not including the system
     #                       prefix.
     def run_container(name)
-      container_name = "#{@project.system_prefix}-#{name}"
+      if name == @project.system_prefix
+        container_name = name
+      else
+        container_name = "#{@project.system_prefix}-#{name}"
+      end
       remove_container container_name
       
       flags = ["-d"]

data/lib/ruby_yacht/runner/services.rb

@@ -51,8 +51,8 @@ module RubyYacht::Runner
       end
       
       projects.each do |project|
-        if project.database.local?
-          docker "#{command} #{project.system_prefix}-database"
+        project.databases.select(&:local?).each do |database|
+          docker "#{command} #{database.container_name(project)}"
         end
         
         project.apps.each do |app|