docker-rails 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ffcac9672d5ba6fa9dbc6dfe46fcd5bc1c59e12
-  data.tar.gz: 6b99bcd91aeb6f31749204808501ba4c8904afeb
+  metadata.gz: 29eddb9dd688e2781429ec0fa43faa2eb5797a60
+  data.tar.gz: fbcb78c9a799b9a7bae895a5727904d344f7a9a1
 SHA512:
-  metadata.gz: 1d9b1f9dc1f4f504581cdcd176562e8d636ce3c8ac85001e2ab3d3a83dd7973a7cce9f201a6a9fd4b21dd321c586c4f73c92372149ed6edc30497f0eae7b3c75
-  data.tar.gz: f3a0e5b27b2d01ee13677c14d1a80dd88fabeb4e4c81471bd3617c87a0e34a738e297835d6409a7129876ce3e8f31c631f7c3f6a439f991b1da8f24cf3393a0b
+  metadata.gz: ee49cf865269e985ba43848ec8cfe3ceeac29fc58802d4b44b0631ac5065e1f22d26767aff4abaf6619f5a804a0f7baeb1437711d85860c75ab31b7c54e28837
+  data.tar.gz: 44911f7657c234530b003e41f46435862a832ba024553cf8e19bb4869e19ddd2c33a9c159cc7c163a8937fd76b6d134c4f9c8ce3e845d9e91221274747f75bc8

data/README.md

@@ -9,7 +9,7 @@ A simplified pattern to execute rails applications within Docker (with a CI buil
 - DRY declarative `docker-rails.yml` allowing multiple environments to be defined with an inherited docker `compose` configuration
 - Provides individual convenience functions `up | bash | stop | extract | cleanup` to easily work with target environment (even in a concurrent situation)
 - Full workflow for CI usage with automated container, volume, and image cleanup.
-- Automated cached global gems data volume based on ruby version
+- Automated cached global gemset data volume (sets up GEM_HOME and `volumes_from` in all targeted containers)
 - Interpolates variables `docker-compose.yml` making CI builds much easier
 - DB check CLI function provided for docker-compose `command` to check if db is ready
 - Configurable exit_code for `ci` - determine which container's exit code will be the result of the process (useful for CI tests)
@@ -28,7 +28,7 @@ CI, the reason this is built. Do it all, do it consistently, do it concurrently,
 
 1. `before_command` - run anything on the host prior to building the docker image e.g. `rm -Rf target`
 2. `compose` - create the resolved `docker-compose.yml`
-3. `gems_volume` - find or create the shared global gems volume for this ruby version
+3. `gemset_volume` - find or create the shared global gems volume for this ruby version
 4. `build` - `docker-compose build` the configuration
 5. `up` - `docker-compose up` the configuration
 6. `cleanup`
@@ -79,7 +79,7 @@ Commands:
   docker-rails compose <target>                        # Writes a resolved docker-compose.yml file e.g. bundle exec docker-rails compose --build=222 test
   docker-rails db_check <db>                           # Runs db_check e.g. bundle exec docker-rails db_check mysql
   docker-rails exec <target> <service_name> <command>  # Run an arbitrary command on a given service container e.g. bundle exec docker-rails exec --build=222 development db bash
-  docker-rails gems_volume <command>                   # Gems volume management e.g. bundle exec docker-rails gems_volume create
+  docker-rails gemset_volume <command>                   # Gems volume management e.g. bundle exec docker-rails gemset_volume create
   docker-rails help [COMMAND]                          # Describe available commands or one specific command
   docker-rails ps <target>                             # List containers for the target compose configuration e.g. bundle exec docker-rails ps --build=222 development
   docker-rails ps_all                                  # List all remaining containers regardless of state e.g. bundle exec docker-rails ps_all
@@ -148,6 +148,13 @@ verbose: true
 exit_code: web
 before_command: bash -c "rm -Rf target && rm -Rf spec/dummy/log"
 
+# create a global gemset to be shared amongst all ruby 2.2.2 containers.
+gemset:
+  name: 2.2.2
+  # setup GEM_HOME environment variable and `volumes_from` to mount the global gemset container
+  containers:
+    - web
+
 extractions: &extractions
   web:
     extract:
@@ -295,15 +302,6 @@ compose:
     links:
       - db
 
-    volumes_from:
-      # Mount the gems data volume container for cached bundler gem files
-      - #{DOCKER_RAILS_GEMS_VOLUME_NAME}
-
-    # https://docs.docker.com/v1.6/docker-compose/cli/#environment-variables
-    environment:
-      # Tell bundler where to get the files
-      - GEM_HOME=#{DOCKER_RAILS_GEMS_VOLUME_PATH}
-
   db:
     # https://github.com/docker-library/docs/tree/master/mysql
     image: library/mysql:5.7.6

data/lib/docker/rails.rb

@@ -17,6 +17,6 @@ require 'docker/rails/compose_config'
 require 'docker/rails/app'
 
 require 'docker/rails/cli/db_check'
-require 'docker/rails/cli/gems_volume'
+require 'docker/rails/cli/gemset_volume'
 
 require 'docker/rails/cli/main'

data/lib/docker/rails/app.rb

@@ -9,8 +9,8 @@ module Docker
                   :build, # given build, usually a number
                   :project_name, # resolved compose project name
                   :target,
-                  :gems_volume_path,
-                  :gems_volume_name,
+                  :gemset_volume_path,
+                  :gemset_volume_name,
                   :compose_filename,
                   :exit_code
 
@@ -27,8 +27,6 @@ module Docker
       end
 
       def initialize
-        discover_ruby_version
-        set_gems_volume_vars
       end
 
       def configure(options)
@@ -51,9 +49,32 @@ module Docker
         @config = Docker::Rails::Config.new
         @config.load!(@target)
 
+        # these are generated/resolved in the config#load, grab them for convenience
+        @gemset_volume_path = ENV['DOCKER_RAILS_GEMSET_VOLUME_PATH']
+        @gemset_volume_name = ENV['DOCKER_RAILS_GEMSET_VOLUME_NAME']
+
         @is_configured = true
       end
 
+      def compose
+        # Write a docker-compose.yml with interpolated variables
+        @compose_filename = compose_filename_from @project_name
+
+        rm_compose
+
+        @config.write_docker_compose_file(@compose_filename)
+
+        @compose_config = Docker::Rails::ComposeConfig.new
+        @compose_config.load!(nil, @compose_filename)
+
+        # check the exit_code
+        if @config['exit_code'].nil?
+          first_defined_service = @compose_config.keys[0]
+          puts "exit_code not set in configuration, using exit code from first defined service: #{first_defined_service}"
+          @config['exit_code'] = first_defined_service
+        end
+      end
+
       def is_configured?
         @is_configured || false
       end
@@ -105,25 +126,6 @@ module Docker
         end
       end
 
-      def compose
-        # Write a docker-compose.yml with interpolated variables
-        @compose_filename = compose_filename_from @project_name
-
-        rm_compose
-
-        @config.write_docker_compose_file(@compose_filename)
-
-        @compose_config = Docker::Rails::ComposeConfig.new
-        @compose_config.load!(nil, @compose_filename)
-
-        # check the exit_code
-        if @config['exit_code'].nil?
-          first_defined_service = @compose_config.keys[0]
-          puts "exit_code not set in configuration, using exit code from first defined service: #{first_defined_service}"
-          @config['exit_code'] = first_defined_service
-        end
-      end
-
       def rm_compose
         # Delete old docker compose files
         exec "rm #{compose_filename_from '*'}" rescue ''
@@ -250,7 +252,7 @@ module Docker
         puts '-----------------------------'
 
         list_images_cmd = 'docker images --filter dangling=true -q'
-        output = exec( list_images_cmd, true)
+        output = exec(list_images_cmd, true)
 
         # if there are any dangling, let's clean them up.
         exec("#{list_images_cmd} | xargs docker rmi", false, true) if !output.nil? && output.length > 0
@@ -259,7 +261,7 @@ module Docker
 
       def run_service_command(service_name, command)
         # Run the compose configuration
-        exec_compose "run #{service_name} #{command}"
+        exec_compose("run #{service_name} #{command}", false, '', true)
       end
 
       def bash_connect(service_name)
@@ -278,12 +280,12 @@ module Docker
       #     https://docs.docker.com/userguide/dockervolumes/
       def create_gems_volume
         begin
-          Docker::Container.get(@gems_volume_name)
-          puts "Gem data volume container #{@gems_volume_name} already exists."
+          Docker::Container.get(@gemset_volume_name)
+          puts "Gem data volume container #{@gemset_volume_name} already exists."
         rescue Docker::Error::NotFoundError => e
 
-          exec "docker create -v #{@gems_volume_path} --name #{@gems_volume_name} busybox"
-          puts "Gem data volume container #{@gems_volume_name} created."
+          exec "docker create -v #{@gemset_volume_path} --name #{@gemset_volume_name} busybox"
+          puts "Gem data volume container #{@gemset_volume_name} created."
         end
       end
 
@@ -302,8 +304,11 @@ module Docker
       end
 
       # convenience to execute docker-compose with file and project params
-      def exec_compose(cmd, capture = false, options = '')
-        exec("docker-compose -f #{@compose_filename} -p #{@project_name} #{cmd} #{options}", capture)
+      def exec_compose(cmd, capture = false, options = '', ignore_errors = false)
+        # in the case of running a bash session, this file may dissappear, just make sure it is there.
+        compose unless File.exists?(@compose_filename)
+
+        exec("docker-compose -f #{@compose_filename} -p #{@project_name} #{cmd} #{options}", capture, ignore_errors)
       end
 
       def get_container(service_name)
@@ -330,18 +335,6 @@ module Docker
         @verbose ||= (@config['verbose'] unless @config.nil?) || false
       end
 
-      def set_gems_volume_vars
-        # Set as variable for interpolation
-        ENV['DOCKER_RAILS_GEMS_VOLUME_PATH'] = @gems_volume_path = "/gems/#{@ruby_version}"
-        ENV['DOCKER_RAILS_GEMS_VOLUME_NAME'] = @gems_volume_name = "gems-#{@ruby_version}"
-      end
-
-      def discover_ruby_version
-        # Discover ruby version from the Dockerfile image
-        IO.read('Dockerfile') =~ /^FROM \w+\/ruby:(\d+.\d+(?:.\d+))/
-        @ruby_version = $1
-      end
-
       # accessible so that we can delete patterns
       def compose_filename_from(project_name)
         "docker-compose-#{project_name}.yml"

data/lib/docker/rails/cli/{gems_volume.rb → gemset_volume.rb}

@@ -1,7 +1,7 @@
 module Docker
   module Rails
     module CLI
-      class GemsVolume < Thor
+      class GemsetVolume < Thor
 
         default_task :help
 

data/lib/docker/rails/cli/main.rb

@@ -9,10 +9,10 @@ module Docker
         desc 'db_check <db>', 'Runs db_check e.g. bundle exec docker-rails db_check mysql'
         subcommand 'db_check', Docker::Rails::CLI::DbCheck
 
-        desc 'gems_volume <command>', 'Gems volume management e.g. bundle exec docker-rails gems_volume create'
-        subcommand 'gems_volume', Docker::Rails::CLI::GemsVolume
+        desc 'gemset_volume <command>', 'Gemset volume management e.g. docker-rails gemset_volume create'
+        subcommand 'gemset_volume', Docker::Rails::CLI::GemsetVolume
 
-        desc 'ci <target>', 'Execute the works, everything with cleanup included e.g. bundle exec docker-rails ci --build=222 test'
+        desc 'ci <target>', 'Execute the works, everything with cleanup included e.g. docker-rails ci --build=222 test'
         long_desc <<-D
 
           `ci` will run the target with the given build (-b) number then cleanup everything upon completion.
@@ -26,7 +26,7 @@ module Docker
 
           invoke :before, [target], []
           invoke :compose, [target], []
-          invoke CLI::GemsVolume, :create, [target], options
+          invoke CLI::GemsetVolume, :create, [target], options
           begin
             invoke :build # on CI - always build to ensure dockerfile hasn't been altered - small price to pay for consistent CI.
             invoke :up
@@ -45,7 +45,7 @@ module Docker
           app.extract
         end
 
-        desc 'cleanup <target>', 'Runs container cleanup functions stop, rm_volumes, rm_compose, rm_dangling, ps_all e.g. bundle exec docker-rails cleanup --build=222 development'
+        desc 'cleanup <target>', 'Runs container cleanup functions stop, rm_volumes, rm_compose, rm_dangling, ps_all e.g. docker-rails cleanup --build=222 development'
         option :extract, aliases: ['-e'], type: :boolean, default: true, desc: 'Extract any directories defined in configuration.'
 
         def cleanup(target)
@@ -57,7 +57,7 @@ module Docker
           invoke :ps_all
         end
 
-        desc 'up <target>', 'Up the docker-compose configuration for the given build/target. Use -d for detached mode. e.g. bundle exec docker-rails up -d --build=222 test'
+        desc 'up <target>', 'Up the docker-compose configuration for the given build/target. Use -d for detached mode. e.g. docker-rails up -d --build=222 test'
         option :detached, aliases: ['-d'], type: :boolean, desc: 'Detached mode: Run containers in the background'
 
         def up(target)
@@ -66,7 +66,7 @@ module Docker
           base_options = options.except(:detached)
 
           invoke :before, [target], base_options
-          invoke CLI::GemsVolume, :create, [target], base_options
+          invoke CLI::GemsetVolume, :create, [target], base_options
 
           compose_options = ''
           compose_options = '-d' if options[:detached]
@@ -74,14 +74,14 @@ module Docker
           app.up(compose_options)
         end
 
-        desc 'build <target>', 'Build for the given build/target e.g. bundle exec docker-rails build --build=222 development'
+        desc 'build <target>', 'Build for the given build/target e.g. docker-rails build --build=222 development'
 
         def build(target)
           invoke :compose
           App.configured(target, options).compose_build
         end
 
-        desc 'compose <target>', 'Writes a resolved docker-compose.yml file e.g. bundle exec docker-rails compose --build=222 test'
+        desc 'compose <target>', 'Writes a resolved docker-compose.yml file e.g. docker-rails compose --build=222 test'
 
         def compose(target)
           App.configured(target, options).compose
@@ -95,46 +95,46 @@ module Docker
           app.before_command
         end
 
-        desc 'stop <target>', 'Stop all running containers for the given build/target e.g. bundle exec docker-rails stop --build=222 development'
+        desc 'stop <target>', 'Stop all running containers for the given build/target e.g. docker-rails stop --build=222 development'
 
         def stop(target)
           invoke :compose
           App.configured(target, options).stop
         end
 
-        desc 'rm_volumes <target>', 'Stop all running containers and remove corresponding volumes for the given build/target e.g. bundle exec docker-rails rm_volumes --build=222 development'
+        desc 'rm_volumes <target>', 'Stop all running containers and remove corresponding volumes for the given build/target e.g. docker-rails rm_volumes --build=222 development'
 
         def rm_volumes(target)
           invoke :stop
           App.configured(target, options).rm_volumes
         end
 
-        desc 'rm_compose', 'Remove generated docker_compose file e.g. bundle exec docker-rails rm_compose --build=222 development', hide: true
+        desc 'rm_compose', 'Remove generated docker_compose file e.g. docker-rails rm_compose --build=222 development', hide: true
 
         def rm_compose(build = nil, target = nil)
           App.instance.rm_compose
         end
 
-        desc 'rm_dangling', 'Remove danging images e.g. bundle exec docker-rails rm_dangling'
+        desc 'rm_dangling', 'Remove danging images e.g. docker-rails rm_dangling'
 
         def rm_dangling(build = nil, target = nil)
           App.instance.rm_dangling
         end
 
-        desc 'ps <target>', 'List containers for the target compose configuration e.g. bundle exec docker-rails ps --build=222 development'
+        desc 'ps <target>', 'List containers for the target compose configuration e.g. docker-rails ps --build=222 development'
 
         def ps(target)
           invoke :compose
           App.configured(target, options).ps
         end
 
-        desc 'ps_all', 'List all remaining containers regardless of state e.g. bundle exec docker-rails ps_all'
+        desc 'ps_all', 'List all remaining containers regardless of state e.g. docker-rails ps_all'
 
         def ps_all(build = nil, target = nil)
           App.instance.ps_all
         end
 
-        desc 'bash_connect <target> <service_name>', 'Open a bash shell to a running container (with automatic cleanup) e.g. bundle exec docker-rails bash --build=222 development db'
+        desc 'bash_connect <target> <service_name>', 'Open a bash shell to a running container (with automatic cleanup) e.g. docker-rails bash --build=222 development db'
 
         def bash_connect(target, service_name)
           # init singleton with full options
@@ -150,7 +150,7 @@ module Docker
           container.remove(v: true, force: true)
         end
 
-        desc 'exec <target> <service_name> <command>', 'Run an arbitrary command on a given service container e.g. bundle exec docker-rails exec --build=222 development db bash'
+        desc 'exec <target> <service_name> <command>', 'Run an arbitrary command on a given service container e.g. docker-rails exec --build=222 development db bash'
 
         def exec(target, service_name, command)
           # init singleton with full options

data/lib/docker/rails/config.rb

@@ -2,6 +2,20 @@ module Docker
   module Rails
     require 'dry/config'
     class Config < Dry::Config::Base
+
+      # environment:
+      #   # make ssh keys available via ssh forwarding (see volume entry)
+      #   - SSH_AUTH_SOCK=/ssh-agent/socket
+      #
+      # volumes_from:
+      #   # Use configured whilp/ssh-agent long running container for keys
+      #   - ssh-agent
+      SSH_AGENT_DEFAULT_CONFIG = {
+          environment: ['SSH_AUTH_SOCK=/ssh-agent/socket'],
+          volumes_from: ['ssh-agent']
+      }
+
+
       def initialize(options = {})
         super({
                   default_configuration: {
@@ -27,6 +41,50 @@ module Docker
         config = load_unpruned(environment, *filenames)
         raise "Unknown target environment '#{environment.to_sym}'" if config[environment.to_sym].nil?
 
+
+        # -----------------------------------------------------
+        # Generate defaults for GEMSET_VOLUME and SSH_AGENT
+        generated_defaults = {compose: {}}
+        compose = generated_defaults[:compose]
+
+        # ----
+        # ssh-agent
+        ssh_agent = config[:'ssh-agent']
+        if !ssh_agent.nil?
+          ssh_agent[:containers].each do |container|
+            raise "Unknown container #{container}" if config[:compose][container.to_sym].nil?
+            compose[container.to_sym] ||= {}
+            compose[container.to_sym].deeper_merge! ({}.merge SSH_AGENT_DEFAULT_CONFIG)
+          end
+        end
+
+        # ----
+        # gemset volume
+        gemset = config[:gemset]
+        raise "Expected to find 'gemset:' in #{filenames}" if gemset.nil?
+
+        gemset_name = gemset[:name]
+        raise "Expected to find 'gemset: name' in #{filenames}" if gemset_name.nil?
+
+        ENV['DOCKER_RAILS_GEMSET_VOLUME_PATH'] = gemset_volume_path = "/gemset/#{gemset_name}"
+        ENV['DOCKER_RAILS_GEMSET_VOLUME_NAME'] = gemset_volume_name = "gemset-#{gemset_name}"
+
+        raise "Expected to find 'gemset: containers' with at least one entry" if gemset[:containers].nil? || gemset[:containers].length < 1
+        gemset[:containers].each do |container|
+          raise "Unknown container #{container}" if config[:compose][container.to_sym].nil?
+          compose[container.to_sym] ||= {}
+          compose[container.to_sym].deeper_merge! ({
+                                                      environment: ["GEM_HOME=#{gemset_volume_path}"],
+                                                      volumes_from: [gemset_volume_name]
+                                                  })
+        end
+
+        # now add the generated to the seeded default configuration
+        @default_configuration.merge!(generated_defaults)
+
+        # reset the base @configuration by loading the new default configuration
+        clear
+
         # finally, load the config as internal state
         super(environment, *filenames)
       end

data/lib/docker/rails/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Rails
-    VERSION = '0.5.6'
+    VERSION = '0.6.0'
   end
 end

data/spec/docker/rails/config_spec.rb

@@ -23,7 +23,7 @@ describe Docker::Rails::Config do
     expect {
       Dir.chdir(File.dirname(__FILE__)) do
         config.clear
-        config.load!(:foo)
+        config.load!(:foobar)
       end
     }.to raise_error /Unknown target environment/
   end
@@ -39,11 +39,11 @@ describe Docker::Rails::Config do
 
 
   context ':development' do
-
+    let(:target_env){ :development}
     before(:each) {
       Dir.chdir(File.dirname(__FILE__)) do
         config.clear
-        config.load!(:development)
+        config.load!(target_env)
       end
     }
 
@@ -62,16 +62,30 @@ describe Docker::Rails::Config do
       expect(config.production).to be_nil
     end
 
-    it 'should write a docker-compose file' do
-      file = tmp_file
-      config.write_docker_compose_file(file)
-    end
-
     it 'should manipulate command to yaml single line' do
       yaml = config.to_yaml
       expect(yaml).to include 'command: >'
       expect(yaml).not_to include 'command: |'
     end
+
+    context 'compose' do
+      let(:compose_config) {
+        file = tmp_file('compose')
+        config.write_docker_compose_file(file)
+        compose_config =Docker::Rails::ComposeConfig.new
+        compose_config.load!(nil, file)
+        compose_config
+      }
+
+      it 'web should have ssh-agent' do
+        expect(compose_config[:web][:environment]).to include('SSH_AUTH_SOCK=/ssh-agent/socket')
+        expect(compose_config[:web][:volumes_from]).to include('ssh-agent')
+      end
+      it 'web should have gemset' do
+        expect(compose_config[:web][:environment]).to include('GEM_HOME=/gemset/2.2.2')
+        expect(compose_config[:web][:volumes_from]).to include('gemset-2.2.2')
+      end
+    end
   end
 
   # it 'should read specific file' do
@@ -90,7 +104,7 @@ describe Docker::Rails::Config do
   end
 
   def tmp_file(name = 'foo')
-    file = File.expand_path("../../../../tmp/#{name}-docker-rails.yml", __FILE__)
+    file = File.expand_path("../../../../tmp/#{name}-docker-rails-config_spec.yml", __FILE__)
     FileUtils.mkdir_p File.dirname file
     file
   end

data/spec/docker/rails/docker-rails.yml

@@ -1,4 +1,53 @@
 verbose: true
+before_command: bash -c "rm -Rf target && rm -Rf log"
+exit_code: web
+
+# create a global gemset to be shared amongst all ruby 2.2.2 containers.
+gemset:
+  name: 2.2.2
+  # setup GEM_HOME environment variable and `volumes_from` to mount the global gemset container
+  containers:
+    - web
+
+# Generated:
+#compose:
+#  web:
+#    environment:
+#      # Tell bundler where to get the files
+#      - GEM_HOME=/gemset/2.2.2
+#
+#    volumes_from:
+#      # Mount the gems data volume container for cached bundler gem files
+#      - gemset-2.2.2
+
+
+# Make the host user's id_rsa key available to the web container e.g. for cloning from github
+ssh-agent:
+  containers:
+    - web
+  keys:
+    - id_rsa
+
+# Generated:
+#compose:
+#  web:
+#    environment:
+#      # make ssh keys available via ssh forwarding (see volume entry)
+#      - SSH_AUTH_SOCK=/ssh-agent/socket
+#
+#    volumes_from:
+#      # Use configured whilp/ssh-agent long running container for keys
+#      - ssh-agent
+
+
+extractions: &extractions
+  web:
+    extract:
+      - '/project/target'
+      - '/project/vcr'
+      - '/project/tmp/parallel_runtime_cucumber.log:./tmp'
+      - '/project/tmp/parallel_runtime_rspec.log:./tmp'
+      - '/project/log'
 
 # local environments need elasticsearch, staging/production connects to existing running instance.
 elasticsearch: &elasticsearch
@@ -7,6 +56,16 @@ elasticsearch: &elasticsearch
     ports:
       - "9200"
 
+foo:
+  compose:
+    web:
+      command: bash -c "sleep 10 && echo 'foo' && exit 187"
+
+bundle_only:
+  compose:
+    web:
+      command: bash -c "bundle install --jobs 4 --retry 3"
+
 development:
   compose:
     <<: *elasticsearch
@@ -24,25 +83,25 @@ development:
         && echo 'Generating Spring binstubs'
         && bundle exec spring binstub --all
 
-        && echo 'Clearing logs and tmp dirs'
-        && bundle exec rake log:clear tmp:clear
+        && echo 'Clearing logs'
+        && bundle exec rake log:clear
 
         && echo 'Check and wait for database connection'
         && bundle exec docker-rails db_check mysql
 
-        && echo 'Setting up new db if one doesn't exist'
-        && bundle exec rake db:version || { bundle exec rake db:setup; }
+        && echo 'DB rebuild'
+        && bundle exec rake db:rebuild_dev
 
         && echo "Starting app server"
         && bundle exec rails s -p 3000
-
-        && echo 'Setup and start foreman'
-        && gem install foreman
-        && foreman start
         "
 
+#        && echo 'Setup and start foreman'
+#        && gem install foreman
+#        && foreman start
+
 test:
-  before_command: rm -Rf target
+  <<: *extractions
   compose:
     <<: *elasticsearch
     web:
@@ -55,22 +114,28 @@ test:
         echo 'Bundling gems'
         && bundle install --jobs 4 --retry 3
 
-        && echo 'Clearing logs and tmp dirs'
-        && bundle exec rake log:clear tmp:clear
-
         && echo 'Check and wait for database connection'
         && bundle exec docker-rails db_check mysql
 
-        && echo 'Setting up new db if one doesn't exist'
-        && bundle exec rake db:version || { bundle exec rake db:setup; }
+        && echo 'DB rebuild'
+        && bundle exec rake db:rebuild_test
 
         && echo 'Tests'
         && cd ../..
-        && xvfb-run -a bundle exec rake spec cucumber
+        && xvfb-run -a bundle exec rake \
+            spec SPEC=spec/app/models/batch/csv_spec.rb \
+            cucumber FEATURE=features/activation/4_admin_import_members.feature
         "
 
+#        && xvfb-run -a bundle exec rake spec
+#        && xvfb-run -a bundle exec rake spec SPEC=spec/app/models/plan_spec.rb
+#        && xvfb-run -a bundle exec rake spec SPEC=spec/app/models/plan_spec.rb cucumber FEATURE=features/public_pages.feature
+
+# cucumber
+# rake FEATURE=features/adding_products.feature cucumber
+
 parallel_tests:
-  before_command: rm -Rf target
+  <<: *extractions
   compose:
     <<: *elasticsearch
     web:
@@ -82,20 +147,17 @@ parallel_tests:
         bash -c "
 
         echo 'Bundling gems'
-        && bundle install --jobs 4 --retry 3
-
-        && echo 'Clearing logs and tmp dirs'
-        && bundle exec rake log:clear tmp:clear
+        && time bundle install --jobs 4 --retry 3
 
         && echo 'Check and wait for database connection'
-        && bundle exec docker-rails db_check mysql
+        && time bundle exec docker-rails db_check mysql
 
-        && echo 'Setting up new db if one doesn't exist'
-        && bundle exec rake parallel:drop parallel:create parallel:migrate parallel:seed
+        && echo 'DB rebuild'
+        && time bundle exec rake db:rebuild_test[true]
 
-        && echo 'Tests'
         && cd ../..
-        && xvfb-run -a bundle exec rake parallel:spec parallel:features
+        && echo 'Tests'
+        && time xvfb-run -a bundle exec rake parallel:spec parallel:features
         "
 
 staging:
@@ -109,13 +171,13 @@ staging:
         echo 'Bundling gems'
         && bundle install --jobs 4 --retry 3
 
-        && echo 'Clearing logs and tmp dirs'
-        && bundle exec rake log:clear tmp:clear
+        && echo 'Clearing logs'
+        && bundle exec rake log:clear
 
         && echo 'Check and wait for database connection'
         && bundle exec docker-rails db_check mysql
 
-        && echo 'Setting up new db if one doesn't exist'
+        && echo 'DB rebuild'
         && bundle exec rake db:migrate
 
         && echo "Starting app server"
@@ -125,35 +187,27 @@ staging:
         && gem install foreman
         && foreman start
         "
-
 compose:
+
   web:
     build: .
-    working_dir: /project/spec/dummy
+    working_dir: /project
     ports:
       - "3000"
 
     links:
       - db
 
-    volumes:
-      - .:/project
-
-    volumes_from:
-      # Mount the gems data volume container for cached bundler gem files
-      - #{DOCKER_RAILS_GEMS_VOLUME_NAME}
-
-    # https://docs.docker.com/v1.6/compose/cli/#environment-variables
-    environment:
-      # Tell bundler where to get the files
-      - GEM_HOME=#{DOCKER_RAILS_GEMS_VOLUME_PATH}
-
   db:
     # https://github.com/docker-library/docs/tree/master/mysql
-    image: library/mysql:5.7.6
+    image: library/mysql:5.7
     ports:
       - "3306"
 
+    volumes:
+      - ./db/mysql:/etc/mysql/conf.d
+#      - ./target/mysql/data:/var/lib/mysql
+
     # https://github.com/docker-library/docs/tree/master/mysql#environment-variables
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Kevin Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,7 +158,7 @@ files:
 - lib/docker/rails.rb
 - lib/docker/rails/app.rb
 - lib/docker/rails/cli/db_check.rb
-- lib/docker/rails/cli/gems_volume.rb
+- lib/docker/rails/cli/gemset_volume.rb
 - lib/docker/rails/cli/main.rb
 - lib/docker/rails/compose_config.rb
 - lib/docker/rails/config.rb