dockly 1.4.2 → 1.4.3

data/README.md

@@ -146,7 +146,7 @@ In addition to the above attributes, `docker` has the following references:
     - allows multiple
     - class: `Dockly::BuildCache`
     - description: a caching system to stop rebuilding/compiling the same files every time
-- `build_cache`
+- `registry`
     - required: `false`
     - allows one
     - class: `Dockly::Docker::Registry`

data/lib/dockly/deb.rb

@@ -7,7 +7,8 @@ class Dockly::Deb
   logger_prefix '[dockly deb]'
   dsl_attribute :package_name, :version, :release, :arch, :build_dir,
                 :pre_install, :post_install, :pre_uninstall, :post_uninstall,
-                :s3_bucket, :files
+                :s3_bucket, :files, :app_user
+
   dsl_class_attribute :docker, Dockly::Docker
   dsl_class_attribute :foreman, Dockly::Foreman
 
@@ -16,6 +17,7 @@ class Dockly::Deb
   default_value :arch, 'x86_64'
   default_value :build_dir, 'build/deb'
   default_value :files, []
+  default_value :app_user, 'nobody'
 
   def file(source, destination)
     @files << { :source => source, :destination => destination }
@@ -88,11 +90,12 @@ private
     add_docker(@dir_package)
     add_foreman(@dir_package)
     add_files(@dir_package)
+    add_docker_auth_config(@dir_package)
 
     debug "converting to deb"
     @deb_package = @dir_package.convert(FPM::Package::Deb)
 
-    @deb_package.scripts[:before_install] = compile_pre_install
+    @deb_package.scripts[:before_install] = pre_install
     @deb_package.scripts[:after_install] = post_install
     @deb_package.scripts[:before_remove] = pre_uninstall
     @deb_package.scripts[:after_remove] = post_uninstall
@@ -140,19 +143,15 @@ private
     end
   end
 
-  def compile_pre_install
-    registry = !docker.nil? && docker.registry
-    if registry
-      login_str = if registry.authentication_required?
-        "docker login -e '#{registry.email}' -p '$DOCKER_REGISTRY_PASSWORD' -u '#{registry.username}'"
-      end
-      [
-        pre_install,
-        login_str,
-        "docker pull #{docker.repo}"
-      ].compact.join("\n")
-    else
-      pre_install
+  def add_docker_auth_config(package)
+    return if docker.nil? || (registry = docker.registry).nil? || !registry.authentication_required?
+    info "adding docker config file"
+    registry.generate_config_file!
+
+    package.attributes[:prefix] = docker.auth_config_file || "~#{app_user}/.dockercfg"
+    Dir.chdir(File.dirname(registry.config_file)) do
+      package.input(File.basename(registry.config_file))
     end
+    package.attributes[:prefix] = nil
   end
 end

data/lib/dockly/docker.rb

@@ -17,7 +17,7 @@ class Dockly::Docker
   dsl_class_attribute :registry, Dockly::Docker::Registry
 
   dsl_attribute :name, :import, :git_archive, :build, :tag, :build_dir, :package_dir,
-    :timeout, :cleanup_images, :registry_import
+    :timeout, :cleanup_images, :registry_import, :auth_config_file
 
   default_value :tag, nil
   default_value :build_dir, 'build/docker'

data/lib/dockly/docker/registry.rb

@@ -31,6 +31,26 @@ class Dockly::Docker::Registry
     server_address == DEFAULT_SERVER_ADDRESS
   end
 
+  def config_file
+    @config_file ||= File.join('build', 'docker', 'registry', '.dockercfg')
+  end
+
+  def generate_config_file!
+    return unless authentication_required?
+    @password ||= ENV['DOCKER_REGISTRY_PASSWORD']
+    ensure_present! :username, :password, :email, :server_address
+
+    auth = {
+      server_address => {
+        :auth => Base64.encode64("#{username}:#{password}"),
+        :email => email.to_s
+      }
+    }.to_json
+
+    FileUtils.mkdir_p(File.dirname(config_file))
+    File.open(config_file, 'w') { |file| file.write(auth) }
+  end
+
   def to_h
     {
       'serveraddress' => server_address,

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.4.2'
+  VERSION = '1.4.3'
 end

data/spec/dockly/deb_spec.rb

@@ -63,6 +63,30 @@ describe Dockly::Deb do
       end
     end
 
+    context 'when it has a docker with registry', :docker do
+      before do
+        subject.docker do
+          name 'deb_test'
+          import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
+          git_archive '.'
+          build 'touch /deb_worked'
+          build_dir 'build/docker'
+          auth_config_file '/etc/docker/.dockercfg'
+
+          registry :test_docker_registry do
+            username 'nahiluhmot'
+            email 'hulihan.tom159@gmail.com'
+          end
+        end
+      end
+
+      it 'builds the docker image and adds it to the deb' do
+        subject.create_package!
+        `dpkg --contents #{filename}`
+            .lines.grep(/.dockercfg/).should_not be_empty
+      end
+    end
+
     context 'when it has files' do
       let(:file1) { Tempfile.new('files') }
       let(:file2) { Tempfile.new('files') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp