docker-rails 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 081568a69c2479bd51fc791e354c457a60b88801
-  data.tar.gz: 2d93f559d571ffd94e847fb8fa5949bdb18cc3e3
+  metadata.gz: 1a5253c80fa206c480db1e56b738ef2fbfe46733
+  data.tar.gz: 0c33db371899c5ec86ef344867ec5e5316f1116c
 SHA512:
-  metadata.gz: 2920bab9b004243d8873b3e78712348c4ac718f006e0d3df7c8690bbdede4f337b365b6d26bd9a06b47296c83bdb52651fcab941b18721a3d258eb532130bfcd
-  data.tar.gz: c6dc7fb1bc824563a72a252cb6561045e411164ac32b229e515633c6f9e6a392ea2664d493fe6847b567d4a030ec75e533dbcc515d798b91be759951cf3871a5
+  metadata.gz: 5fad7285f5e03e731e3fc382edc7b4ace5da6de9b65de221de1902f7969291509a85b9849fa328df43641f1a493166f9b2641e0137004ca60a09d06f0db6bfbe
+  data.tar.gz: 461bc62fac672e235fc63a2de848b11d2f6a2010f9a4549e160338e7df175e3eec318049fc9099531dced3683da074ee3f278e9d54275790b52e812c4d186187

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.2
+ruby-2.3.1

data/README.md

@@ -13,7 +13,6 @@ A simplified pattern to execute rails applications within Docker (with a CI buil
 - 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)
-- Declarative ssh key sharing via SSH Agent Forwarding, including making `known_hosts` available to targeted containers.
 
 ## Usage
 
@@ -28,12 +27,11 @@ CI, the reason this is built. Do it all, do it consistently, do it concurrently,
 `ci` executes: 
 
 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. `gemset_volume create` - find or create the shared global gems volume for this ruby version
-4. `ssh_agent forward` - forward any declared keys and copy in `known_hosts`
-5. `build` - `docker-compose build` the configuration
-6. `up` - `docker-compose up` the configuration
-7. `cleanup`
+1. `compose` - create the resolved `docker-compose.yml`
+1. `gemset_volume create` - find or create the shared global gems volume for this ruby version
+1. `build` - `docker-compose build` the configuration
+1. `up` - `docker-compose up` the configuration
+1. `cleanup`
     1. `stop` - stop all containers for this configuration (including one-off sessions)
     2. `extract` - extract any defined files from any container
     3. `rm_volumes` - `docker-compose rm -v --force` to cleanup any container volumes (excluding the gems volume)
@@ -87,7 +85,6 @@ Commands:
   docker-rails ps_all                                  # List all remaining containers regardless of state e.g. docker-rails ps_all
   docker-rails rm_dangling                             # Remove danging images e.g. docker-rails rm_dangling
   docker-rails 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
-  docker-rails ssh_agent <command>                     # SSH Agent Forwarding e.g. docker-rails ssh_agent forward
   docker-rails stop <target>                           # Stop all running containers for the given build/target e.g. docker-rails stop --build=222 development
   docker-rails 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
 
@@ -159,16 +156,6 @@ gemset:
   containers:
     - web
 
-# ---
-# Make the host user's id_rsa key available to the web container e.g. for cloning from github
-#   If you see "Host key verification failed", make sure the same command runs on the host first 
-#   which will add to the known_hosts file. The known_hosts is copied from the host to the ssh-agent automatically.
-ssh-agent:
-  containers:
-    - web
-  keys:
-    - id_rsa
-
 # ---
 # Declare a reusable extract set
 extractions: &extractions
@@ -197,9 +184,11 @@ compose:
     working_dir: /project/spec/dummy
     ports:
       - "3000"
-
     links:
       - db
+    volumes:
+      # make keys and known_hosts available
+      - ~/.ssh:/root/.ssh      
 
   db:
     # https://github.com/docker-library/docs/tree/master/mysql

data/lib/docker/rails.rb

@@ -18,6 +18,5 @@ require 'docker/rails/app'
 
 require 'docker/rails/cli/db_check'
 require 'docker/rails/cli/gemset_volume'
-require 'docker/rails/cli/ssh_agent'
 
 require 'docker/rails/cli/main'

data/lib/docker/rails/app.rb

@@ -161,7 +161,6 @@ module Docker
             end
           end
         end
-        rm_ssh_agent
         puts 'Done.'
       end
 
@@ -209,24 +208,6 @@ module Docker
         container
       end
 
-      def run_ssh_agent
-        return if @config[:'ssh-agent'].nil?
-        run_ssh_agent_daemon
-        ssh_add_keys
-        ssh_add_known_hosts
-      end
-
-      def rm_ssh_agent
-        ssh_agent_name = @config.ssh_agent_name
-        begin
-          container = Docker::Container.get(ssh_agent_name)
-          stop(container)
-          rm_v(container)
-        rescue Docker::Error::NotFoundError => e
-          puts "SSH Agent forwarding container #{ssh_agent_name} does not exist."
-        end
-      end
-
       # Create global gems data volume to cache gems for this version of ruby
       #     https://docs.docker.com/userguide/dockervolumes/
       def create_gemset_volume
@@ -360,41 +341,6 @@ module Docker
         end
       end
 
-      def ssh_agent_image
-        'whilp/ssh-agent:latest'
-        # 'rosskevin/ssh-agent:latest'
-      end
-
-      def ssh_base_cmd
-        ssh_agent_name = @config.ssh_agent_name
-        "docker run --rm --volumes-from=#{ssh_agent_name} -v ~/.ssh:/ssh #{ssh_agent_image}"
-      end
-
-      def ssh_add_known_hosts
-        exec "#{ssh_base_cmd} cp /ssh/known_hosts /root/.ssh/known_hosts"
-      end
-
-      def ssh_add_keys
-        ssh_keys = @config[:'ssh-agent'][:keys]
-        puts "Forwarding SSH key(s): #{ssh_keys.join(',')} into container(s): #{@config[:'ssh-agent'][:containers].join(',')}"
-        ssh_keys.each do |key_file_name|
-          local_key_file = "#{ENV['HOME']}/.ssh/#{key_file_name}"
-          raise "Local key file #{local_key_file} doesn't exist." unless File.exists? local_key_file
-          exec "#{ssh_base_cmd} ssh-add /ssh/#{key_file_name}"
-        end
-      end
-
-      def run_ssh_agent_daemon
-        ssh_agent_name = @config.ssh_agent_name
-        begin
-          Docker::Container.get(ssh_agent_name)
-          puts "Gem data volume container #{ssh_agent_name} already exists."
-        rescue Docker::Error::NotFoundError => e
-          exec "docker run -d --name=#{ssh_agent_name} #{ssh_agent_image}"
-          puts "SSH Agent forwarding container #{ssh_agent_name} running."
-        end
-      end
-
       def rm_v(container)
         container.remove(v: true, force: true)
       end

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

@@ -12,9 +12,6 @@ module Docker
         desc 'gemset_volume <command>', 'Gemset volume management e.g. docker-rails gemset_volume create'
         subcommand 'gemset_volume', Docker::Rails::CLI::GemsetVolume
 
-        desc 'ssh_agent <command>', 'SSH Agent Forwarding e.g. docker-rails ssh_agent forward'
-        subcommand 'ssh_agent', Docker::Rails::CLI::SshAgent
-
         desc 'ci <target>', 'Execute the works, everything with cleanup included e.g. docker-rails ci --build=222 test'
         long_desc <<-D
 
@@ -30,7 +27,6 @@ module Docker
           invoke :before, [target], []
           invoke :compose, [target], []
           invoke CLI::GemsetVolume, :create, [target], options
-          invoke CLI::SshAgent, :forward, [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
@@ -71,7 +67,6 @@ module Docker
 
           invoke :before, [target], base_options
           invoke CLI::GemsetVolume, :create, [target], base_options
-          invoke CLI::SshAgent, :forward, [target], base_options
 
           if options[:detached]
             compose_options = '-d'
@@ -166,7 +161,6 @@ module Docker
 
           invoke :compose, [target], []
           invoke CLI::GemsetVolume, :create, [target], []
-          invoke CLI::SshAgent, :forward, [target], []
 
           app.run_service_command(service_name, command)
         end

data/lib/docker/rails/config.rb

@@ -29,10 +29,6 @@ module Docker
       end
 
 
-      def ssh_agent_name
-        "#{self[:project_name]}_ssh_agent"
-      end
-
       def write_docker_compose_file(output_filename = 'docker-compose.yml')
         write_yaml_file(output_filename, self[:'compose'])
       end
@@ -64,10 +60,6 @@ module Docker
         generated_defaults = {compose: {}}
         compose = generated_defaults[:compose]
 
-        # ----
-        # ssh-agent
-        generate_ssh_agent(compose, unpruned_config)
-
         # ----
         # gemset volume
         generate_gemset(compose, unpruned_config, generated_defaults, filenames)
@@ -117,29 +109,6 @@ module Docker
                                                   })
         end
       end
-
-      def generate_ssh_agent(compose, unpruned_config)
-        ssh_agent = unpruned_config[:'ssh-agent']
-        if !ssh_agent.nil?
-
-          raise "Expected to find 'ssh-agent: keys' with at least one entry" if ssh_agent[:keys].nil? || ssh_agent[:keys].length < 1
-          ssh_agent[:containers].each do |container|
-            raise "Unknown container #{container}" if unpruned_config[:compose][container.to_sym].nil?
-            # 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
-            #   - <project_name>-ssh-agent
-            compose[container.to_sym] ||= {}
-            compose[container.to_sym].deeper_merge! ({
-                                                        environment: ['SSH_AUTH_SOCK=/root/.ssh/socket'],
-                                                        volumes_from: [ssh_agent_name]
-                                                    })
-          end
-        end
-      end
     end
   end
 end

data/lib/docker/rails/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Rails
-    VERSION = '0.8.0'
+    VERSION = '0.9.0'
   end
 end

data/spec/docker/rails/config_spec.rb

@@ -81,10 +81,6 @@ describe Docker::Rails::Config do
         compose_config
       }
 
-      it 'web should have ssh-agent' do
-        expect(compose_config[:web][:environment]).to include('SSH_AUTH_SOCK=/root/.ssh/socket')
-        expect(compose_config[:web][:volumes_from]).to include("#{project_name}_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')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Kevin Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,7 +160,6 @@ files:
 - lib/docker/rails/cli/db_check.rb
 - lib/docker/rails/cli/gemset_volume.rb
 - lib/docker/rails/cli/main.rb
-- lib/docker/rails/cli/ssh_agent.rb
 - lib/docker/rails/compose_config.rb
 - lib/docker/rails/config.rb
 - lib/docker/rails/ext/container.rb
@@ -189,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simplified pattern to execute rails applications within Docker (with a

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

@@ -1,17 +0,0 @@
-module Docker
-  module Rails
-    module CLI
-      class SshAgent < Thor
-        desc 'forward', 'Run SSH Agent Forwarding'
-        def forward(target = nil)
-          App.configured(target, options).run_ssh_agent
-        end
-
-        desc 'rm', 'Stop and remove SSH Agent Forwarding'
-        def rm(target = nil)
-          App.configured(target, options).rm_ssh_agent
-        end
-      end
-    end
-  end
-end