dockersitter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbf8d43dbdf2221bbab4224b15d05252b8bc955e
-  data.tar.gz: b5596adf47c474f88c727f92908626680af49233
+  metadata.gz: 0d646c9d7f08f2815560d95a646601eb2301456c
+  data.tar.gz: fc5c05e4a5d88c75a0b0382cc9998af711921e90
 SHA512:
-  metadata.gz: df14044e28ecc1c421e62b36afde6287c1df3cdf9201b652064b46d5a2941c14e28376c9f243d4a6bcd7afabff45077b4c13f9aab46ea80457e5ba4aa5fc3e31
-  data.tar.gz: 8a034266932073b381cf2d3d3c9393e949960a2d4d7600e22a45766a39281e81ec9a7440a16bd811b4a2420dc971dba961b34ded282f43b777767d5c04566dbd
+  metadata.gz: 6b34336aa58dea1b12d07a3996df6e04eb3804994a706cbd20690ef775c5d67f9b3589f7ce6b51ccb1f9375697d55f1c0e9caa1a9e10621900b35edfbd2879e9
+  data.tar.gz: 4dca11d8663e2384aacf72aeea88dd7ba6bc222df0bae6d5ef1f72f99f7c8f42dc2a6c04be634bca1031fc45d192c6269be6e4518894bf8d71b21ee64ee37415

data/lib/command_router.rb

@@ -6,6 +6,7 @@ require 'commands/generate_backup_scripts'
 require 'commands/backup_app.rb'
 require 'commands/restore_app.rb'
 require 'commands/start.rb'
+require 'commands/increment.rb'
 require 'util'
 require 'fileutils'
 
@@ -20,6 +21,6 @@ module CommandRouter
     register BackupApp,'backup','backup','creates a backup of the given app.'
     register RestoreApp, 'restore','restore','restores an app.'
     register Start, 'start','start','starts one or multiple apps. If no apps are given, all apps will be started.'
-
+    register Increment, 'increment','increment','increments the version of an image.'
   end
 end

data/lib/commands/create.rb

@@ -11,35 +11,35 @@ class Create < Thor
     File.expand_path('../templates',__dir__)
   end
 
-  class_option :image,
+  option :base,
     :type => :string,
     :desc => "the image which the app is based on.",
-    :alias => 'i',
+    :aliases => 'b',
     :default => "ubuntu:14.04"
 
   class_option :env,
     :type => :array,
     :desc => 'additional environment variables',
-    :alias => 'e',
+    :aliases => 'e',
     :default => []
 
   class_option :packages,
     :type => :array,
     :desc => 'additional packages to install',
-    :alias => 'p',
+    :aliases => 'p',
     :default => []
 
-  class_option :volumes,
-    :type => :array,
-    :desc => 'the volumes your data-container will mount',
-    :alias => 'v',
-    :default => ["/var"]
-
+  
   desc "app APP_NAME", "create a new app."
   option :dockerfile,
     :type => :boolean,
     :desc => 'create a dockerfile for the app',
     :aliases => 'd'
+  option :volumes,
+    :type => :array,
+    :desc => 'the volumes your data-container will mount',
+    :aliases => 'v',
+    :default => ["/var"]
   def app(app_name)
     @app_name = app_name
     @user_email = extract_email
@@ -66,18 +66,21 @@ class Create < Thor
   def image(image_name)
     @user_email = extract_email
     @user_name = extract_name
-    image_path = "#{base_images_dir}/#{image_name}"
+    image_path = "#{base_images_dir}/#{image_name}/v1.0"
     empty_directory "#{image_path}/administration/installation"
     template "Dockerfile.erb","#{image_path}/Dockerfile"
     unless options[:packages].empty?
       options[:packages].each do |package|
-        FileUtils.ln("#{install_dir}/install_#{package}.sh", 
+        FileUtils.cp("#{install_dir}/install_#{package}.sh", 
                      "#{image_path}/administration/installation/install_#{package}.sh")
       end
 
-      FileUtils.ln("#{install_dir}/scriptrunner.sh", 
+      FileUtils.cp("#{install_dir}/scriptrunner.sh", 
                    "#{image_path}/administration/scriptrunner.sh")
     end
-
+    @image_name = image_name
+    @version = "1.0"
+    template "build.erb", "#{image_path}/build.sh"
+    FileUtils.chmod 0755, "#{image_path}/build.sh"
   end
 end

data/lib/commands/increment.rb

@@ -0,0 +1,38 @@
+require 'thor/group'
+require 'fileutils'
+
+class Increment < Thor::Group
+  include Thor::Actions
+  include DockerMgr::Util
+
+  def self.source_root
+    File.expand_path('../templates',__dir__)
+  end
+
+
+  class_option :minor,:aliases => 'm'
+  argument :image_name,:type => :string
+
+  def increment
+    last_version_dir = Dir.entries("#{base_images_dir}/#{@image_name}")
+                          .select {|e| e != "." && e != ".."}
+                          .max {|a,b| a[1..-1].to_f <=> b[1..-1].to_f}
+    last_number =  last_version_dir[1..-1].to_f
+
+    new_number = options[:minor] ? last_number + 0.1 : last_number.to_i + 1.0
+    new_number_format = '%.1f' % new_number
+    empty_directory "#{base_images_dir}/#{@image_name}/v#{new_number_format}"
+    FileUtils.cp_r "#{base_images_dir}/#{@image_name}/#{last_version_dir}/.",
+                   "#{base_images_dir}/#{@image_name}/v#{new_number_format}"
+
+    if File.exist? "#{base_images_dir}/#{@image_name}/v#{new_number_format}/build.sh"
+      FileUtils.rm "#{base_images_dir}/#{@image_name}/v#{new_number_format}/build.sh"
+    end
+    @version = new_number_format
+    template 'build.erb',"#{base_images_dir}/#{@image_name}/v#{new_number_format}/build.sh"
+    FileUtils.chmod 0755, "#{base_images_dir}/#{@image_name}/v#{new_number_format}/build.sh"
+
+
+  end
+
+end

data/lib/docker_mgr/version.rb

@@ -1,4 +1,4 @@
 module DockerMgr
   # docker_mgr version
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/templates/Dockerfile.erb

@@ -1,4 +1,4 @@
-FROM <%=options[:image]%>
+FROM <%=options[:base]%>
 MAINTAINER <%=@user_name%> <<%=@user_email%>> 
 ADD administration/installation /tmp/installation_scripts
 ADD administration/scriptrunner.sh /tmp/scriptrunner.sh

data/lib/templates/build.erb

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo docker build -t <%="#{@image_name}:#{@version}"%> .

data/lib/templates/docker-compose.yml.erb

@@ -1,5 +1,5 @@
 app:
-  <%if options[:image]%>image: <%=options[:image]%> <%else%>build: .<%end%>
+  <%if options[:base]%>image: <%=options[:base]%> <%else%>build: .<%end%>
   volumes_from:
     - appdata
   environment: 
@@ -7,7 +7,7 @@ app:
     <%options[:env].each do | var |%><%=var.gsub('=',': ')%>
     <%end%>  
 appdata:
-  <%if options[:image]%>image: <%=options[:image]%> <%else%>build: .<%end%>
+  <%if options[:base]%>image: <%=options[:base]%> <%else%>build: .<%end%>
   volumes:
   <%options[:volumes].each do |volume|-%>
   - <%=volume%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockersitter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Rene Richter
@@ -123,6 +123,7 @@ files:
 - lib/commands/create.rb
 - lib/commands/delete.rb
 - lib/commands/generate_backup_scripts.rb
+- lib/commands/increment.rb
 - lib/commands/init.rb
 - lib/commands/restore_app.rb
 - lib/commands/start.rb
@@ -144,6 +145,7 @@ files:
 - lib/templates/backup.erb
 - lib/templates/before_all.erb
 - lib/templates/before_all_restore.erb
+- lib/templates/build.erb
 - lib/templates/docker-compose.yml.erb
 - lib/templates/restore.erb
 - lib/util.rb