Merge pull request #159 from airbnb/bump_docker_gem

Loosen docker dependency and show how to install older dependencies
airbnb · Jan 21, 2016 · 0002402 · 0002402
2 parents 8407278 + 941e401
commit 0002402
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 25 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,29 +3,29 @@ PATH
   specs:
     synapse (0.12.2)
       aws-sdk (~> 1.39)
-      docker-api (~> 1.7.2)
+      docker-api (~> 1.7)
+      logging (~> 1.8)
       zk (~> 1.9.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.6)
-    archive-tar-minitar (0.5.2)
+    addressable (2.4.0)
     aws-sdk (1.66.0)
       aws-sdk-v1 (= 1.66.0)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    coderay (1.0.9)
-    crack (0.4.2)
+    coderay (1.1.0)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    docker-api (1.7.6)
-      archive-tar-minitar
-      excon (>= 0.28)
+    docker-api (1.25.0)
+      excon (>= 0.38.0)
       json
     excon (0.45.4)
-    ffi (1.9.3-java)
+    ffi (1.9.10-java)
+    hashdiff (0.2.3)
     json (1.8.3)
     little-plugger (1.1.3)
     logging (1.8.2)
@@ -34,20 +34,20 @@ GEM
     method_source (0.8.2)
     mini_portile2 (2.0.0)
     multi_json (1.11.2)
-    nokogiri (1.6.7)
+    nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry (0.9.12.2-java)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
+    pry (0.10.3-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
       spoon (~> 0.0)
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
-    rake (10.1.1)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
+    rake (10.5.0)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -61,16 +61,16 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
     safe_yaml (1.0.4)
-    slop (3.4.6)
+    slop (3.6.0)
     spoon (0.0.4)
       ffi
-    webmock (1.18.0)
+    webmock (1.22.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    zk (1.9.5)
-      logging (~> 1.8.2)
+      hashdiff
+    zk (1.9.6)
       zookeeper (~> 1.4.0)
-    zookeeper (1.4.10)
+    zookeeper (1.4.11)
 
 PLATFORMS
   java

diff --git a/README.md b/README.md
@@ -97,6 +97,11 @@ install synapse with:
 
 ```bash
 $ mkdir -p /opt/smartstack/synapse
+
+# If you want to install specific versions of dependencies such as an older
+# version of the aws-sdk, the docker-api, etc, gem install that here *before*
+# gem installing synapse
+
 # If you are on Ruby 2.X use --no-document instead of --no-ri --no-rdoc
 $ gem install synapse --install-dir /opt/smartstack/synapse --no-ri --no-rdoc
 ```

diff --git a/synapse.gemspec b/synapse.gemspec
@@ -17,8 +17,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
 
   gem.add_runtime_dependency "aws-sdk", "~> 1.39"
-  gem.add_runtime_dependency "docker-api", "~> 1.7.2"
+  gem.add_runtime_dependency "docker-api", "~> 1.7"
   gem.add_runtime_dependency "zk", "~> 1.9.4"
+  gem.add_runtime_dependency "logging", "~> 1.8"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 3.1.0"