dockly 1.10.0 → 1.11.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGZiYjBlZWZjMzMxOWFhZDMzYzFjZTFiMGQxMWQyZDU5MzI0ZTEzMA==
+    ZWI0NjQwNGQ1ODUyM2JiMjVlMTcxZmYzOGFkNDEzOWJjZmRjZTUzMQ==
   data.tar.gz: !binary |-
-    MzVmODE2ZjhlMTkxMzhiNzNkMGIxZTk2OWI0MDNmYzVlZGFiMDYyOQ==
+    YzNkYTQ3MDkxZWQ1NjAzOWQ5NDViOWFkNWY1YTU2Yzg2NTU2MzM0MQ==
 SHA512:
   metadata.gz: !binary |-
-    YjVmZjBlNGYzNDNlOGE2ZTNkYjNkM2M4NjYxYTUxMzU2MjQ5MWM5ZWQ3MTFi
-    OGU5MzU5OTYzOTNhZWJjM2ZkYTQ2YmM2ZmY2ZDViY2M4OWNiMWIyYTM4OTUy
-    OTc0OWZiZjI5NDcxNDc5NjI2ZmIzMmI1ZTM4MDM2ZWEwZmRiNGE=
+    ZjcxZTUyYjlhYWZjNTFiNWU2NTJkNTA5YzcxNTI4MjUyMGIwMGYwNzc4ZTZl
+    YWYyMzkwMmI3NzUxMWIxMjc2NTNkNWUxZDNmYTRmY2Y1OGJkMzk0NWMzM2Qw
+    NjgyMzk5MTJmOGViOWQ2YzFjYTI0YzFjZmQ1YmI4NTY3NzUyYjc=
   data.tar.gz: !binary |-
-    ZmE2ZmUyMDVhOTcwNGY2NGY4YTMyNmI2MzI4ZTMxYzU5NjJmMThjM2ViYTYw
-    NTBhMjhkZGY1YmYzY2IyMTllYWI5ODk4MzA0NjdlM2U5NGJmODdjYzBmNTg4
-    OTUxYzRiMzdhN2NmMmNmM2E2NzZkYWFmNWI1ODI2N2MwODUzYmQ=
+    ODIzMWI1MzQ1NjUwMGJhMjM3ZjEyOGUyY2UzYmEwM2YzNDIwZmZmMGZmODIz
+    OTRiNGU4MWYyZjc2NWJlMTcxODdjNDNkODk2ZjU1YzcyMDQwMzUzMGUxNGY5
+    MjQyNjUzYjAzMTZmNjE0YWUzY2U5OTdiZjk3NWZkZDAyYTQ2YmY=

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,
                 :deb_build_dir, :pre_install, :post_install, :pre_uninstall,
-                :post_uninstall, :s3_bucket, :files, :app_user, :vendor
+                :post_uninstall, :s3_bucket, :files, :app_user, :vendor,
+                :package_startup_script
 
   dsl_class_attribute :docker, Dockly::Docker
   dsl_class_attribute :foreman, Dockly::Foreman, type: Array
@@ -20,6 +21,7 @@ class Dockly::Deb
   default_value :files, []
   default_value :app_user, 'nobody'
   default_value :vendor, 'Dockly'
+  default_value :package_startup_script, true
 
   def file(source, destination)
     @files << { :source => source, :destination => destination }
@@ -102,7 +104,7 @@ private
     add_files(@dir_package)
     add_docker_auth_config(@dir_package)
     add_docker(@dir_package)
-    add_startup_script(@dir_package)
+    add_startup_script(@dir_package) if package_startup_script
 
     convert_package
 

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.10.0'
+  VERSION = '1.11.0'
 end

data/spec/dockly/deb_spec.rb

@@ -64,7 +64,7 @@ describe Dockly::Deb do
           name 'deb_test'
           import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
           git_archive '.'
-          build 'touch /deb_worked'
+          build 'RUN touch /deb_worked'
           build_dir 'build/docker'
         end
       end
@@ -89,7 +89,7 @@ describe Dockly::Deb do
           name 'deb_test'
           import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
           git_archive '.'
-          build 'touch /deb_worked'
+          build 'RUN touch /deb_worked'
           build_dir 'build/docker'
 
           registry :test_docker_registry do
@@ -166,6 +166,15 @@ describe Dockly::Deb do
       subject.create_package!
       expect(`dpkg --contents #{filename}`).to include("dockly-startup.sh")
     end
+
+    context 'when package_startup_script is false' do
+      before { subject.package_startup_script(false) }
+
+      it 'does not place a startup script in the package' do
+        subject.create_package!
+        expect(`dpkg --contents #{filename}`).to_not include("dockly-startup.sh")
+      end
+    end
   end
 
   describe '#exists?' do

data/spec/dockly/rpm_spec.rb

@@ -51,7 +51,7 @@ describe Dockly::Rpm do
           name 'rpm_test'
           import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
           git_archive '.'
-          build 'touch /rpm_worked'
+          build 'RUN touch /rpm_worked'
           build_dir 'build/docker'
         end
       end
@@ -76,7 +76,7 @@ describe Dockly::Rpm do
           name 'rpm_test'
           import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
           git_archive '.'
-          build 'touch /rpm_worked'
+          build 'RUN touch /rpm_worked'
           build_dir 'build/docker'
 
           registry :test_docker_registry do
@@ -153,6 +153,15 @@ describe Dockly::Rpm do
       subject.create_package!
       expect(`rpm -qpl #{filename}`).to include("dockly-startup.sh")
     end
+
+    context 'when package_startup_script is false' do
+      before { subject.package_startup_script(false) }
+
+      it 'does not place a startup script in the package' do
+        subject.create_package!
+        expect(`rpm -qpl #{filename}`).to_not include("dockly-startup.sh")
+      end
+    end
   end
 
   describe '#exists?' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp