dockersitter 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e652b9251610f5c7799e322a5b77504da8c4cafd
-  data.tar.gz: 9e6a166004767f7ecda66226cbeb9f18c941da99
+  metadata.gz: ce908ad9ece66790ea14cee9c0521058e856de75
+  data.tar.gz: 6725a7bbf1c16a1fbb877e06ff42a1bc3eb862e5
 SHA512:
-  metadata.gz: b945c5650a3f32030a3bf86aba6016679efb2173ec43c6059cb5c5ddd0bc90095d962d80bce55ef2dfc6ad496ee8137ccf0608552d00a6e2c79c401651ea06ee
-  data.tar.gz: aad3a7b75ef7fb96c4081d53c352845fc788901866b9d32ac65a040ea6f742a08ade90c6541e915067e0bf31549250a08ad1def4984b9921a418928219d83534
+  metadata.gz: 9f7d05560345c1a52464c36720b96476932407f96381f0f31f395880f617b8cbba819c977cb95c6ff98f9816e26fb6abc65e7ec023418706d4d4d757ade9f529
+  data.tar.gz: 290b08eef9ff70812e5eb03133e742f44520e4afd99840a46851c8941581297c2bacfc8fcff518b5acd656c752f99bee5123d86b8ebb00dcef32c1d50b2f3de4

data/lib/commands/create.rb

@@ -15,7 +15,7 @@ class Create < Thor
     :type => :string,
     :desc => "the image which the app is based on.",
     :aliases => 'b',
-    :default => "ubuntu:14.04"
+    :default => "base:1.0"
 
   class_option :env,
     :type => :array,
@@ -31,27 +31,19 @@ class Create < Thor
 
   
   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"]
-  option :cert,
-         :desc => "creates a ssl certificate for this app",
-         :aliases => 'c'
-  option :subdomain,
-         :desc => "the subdomain for this app",
-         :type => :string
-
+  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"]
+  option :cert,:desc => "creates a ssl certificate for this app",:aliases =>'c'
+  option :subdomain,:desc => "the subdomain for this app",:type => :string
   def app(app_name)
     subdomain = options.fetch(subdomain,app_name.gsub(/\s/,"-").downcase)
     @domain = "#{subdomain}.#{config[:host]}"
     @app_name = app_name
     @user_email,@user_name = config.values_at(:email,:name)
+    @base = options[:base]
     app_path = "#{apps_dir}/#{@app_name}"
     template "docker-compose.yml.erb","#{app_path}/docker-compose.yml"
     empty_directory "#{app_path}/administration/installation"
@@ -70,19 +62,20 @@ class Create < Thor
       
     end
     append_to_file "#{routine_dir}/backup_routine", "docker_mgr backup_app #{app_name}"
-    create_file "#{vhost_dir}/#{app_name}"
+    create_file "#{vhost_dir}/#{@domain}"
     if options[:cert]
       FileUtils.cd "#{admin_dir}/ca" do
 	      puts "#{admin_dir}/ca/sign.sh"
 	      puts `./sign.sh #{@domain}`
       end
+      chmod "#{proxy_dir}/certs/#{@domain}.key",0600
     end
   end
   
   desc "image IMAGE_NAME","creates a new image."
   def image(image_name)
-    @user_email = extract_email
-    @user_name = extract_name
+    @user_email,@user_name = config.values_at(:email,:name)
+    @base = options[:base]
     image_path = "#{base_images_dir}/#{image_name}/v1.0"
     empty_directory "#{image_path}/administration/installation"
     template "Dockerfile.erb","#{image_path}/Dockerfile"
@@ -94,6 +87,9 @@ class Create < Thor
 
       FileUtils.cp("#{install_dir}/scriptrunner.sh", 
                    "#{image_path}/administration/scriptrunner.sh")
+      FileUtils.cp("#{admin_dir}/trust.sh", 
+                   "#{image_path}/administration/trust.sh")
+      empty_directory("#{image_path}/administration/certificates")
     end
     @image_name = image_name
     @version = "1.0"

data/lib/commands/init.rb

@@ -5,7 +5,7 @@ require 'util'
 class Init < Thor::Group
   include Thor::Actions
   include DockerMgr::Util
-    
+
   def self.source_root
     File.expand_path('../templates',__dir__)
   end
@@ -27,9 +27,29 @@ class Init < Thor::Group
     chmod 'docker/admin/ca/sign.sh',0755
     puts `git init docker`
     FileUtils.cd 'docker' do 
-      puts FileUtils.pwd
       generate_ca_installer
+      image_name = 'base'
+      @user_email,@user_name = config.values_at(:email,:name)
+      image_path = "#{base_images_dir}/#{image_name}/v1.0"
+      empty_directory "#{image_path}/administration/installation"
+      @base = "ubuntu:14.04"
+      template "Dockerfile.erb","#{image_path}/Dockerfile"
+      %w(curl git).each do |package|
+        FileUtils.cp("#{install_dir}/install_#{package}.sh", 
+                     "#{image_path}/administration/installation/install_#{package}.sh")
+      end
+
+      FileUtils.cp("#{install_dir}/scriptrunner.sh", 
+                   "#{image_path}/administration/scriptrunner.sh")
+      FileUtils.cp("#{admin_dir}/trust.sh","#{image_path}/administration/trust.sh")
+      FileUtils.mkdir("#{image_path}/administration/certificates")
+      FileUtils.cp("#{admin_dir}/ca/rootCA.crt","#{image_path}/administration/certificates/rootCA.crt")
+      @image_name = image_name
+      @version = "1.0"
+      template "build.erb", "#{image_path}/build.sh"
+      FileUtils.chmod 0755, "#{image_path}/build.sh"
     end
-  end
 
+
+  end
 end

data/lib/docker_mgr/version.rb

@@ -1,4 +1,4 @@
 module DockerMgr
   # docker_mgr version
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/templates/Dockerfile.erb

@@ -1,6 +1,9 @@
-FROM <%=options[:base]%>
+FROM <%=@base%>
 MAINTAINER <%=@user_name%> <<%=@user_email%>> 
 ADD administration/installation /tmp/installation_scripts
 ADD administration/scriptrunner.sh /tmp/scriptrunner.sh
 RUN chmod +x /tmp/scriptrunner.sh && /bin/bash /tmp/scriptrunner.sh /tmp/installation_scripts
+ADD administration/certificates /tmp/certificates
+ADD administration/trust.sh /tmp/trust.sh
+RUN chmod +x /tmp/trust.sh && /bin/bash /tmp/trust.sh /tmp/certificates
 RUN rm -rf /tmp/*

data/lib/templates/admin/installation_scripts/install_curl.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+apt-get install -y curl

data/lib/templates/admin/trust.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+distribution=$(find /etc/*-release -type f | xargs cat | grep  'ID' | head -n1 | awk -F'=' '{gsub(/"/,"",$2); print tolower($2)}')
+case $distribution in 
+	debian|ubuntu|linuxmint*|elementary*) 
+		sudo mkdir -p /usr/local/share/ca-certificates
+		sudo cp $1/* /usr/local/share/ca-certificates/
+		sudo update-ca-certificates;;
+	fedora|centos) 
+		sudo cp $1 /etc/pki/ca-trust/source/anchors/*
+		sudo update-ca-trust;;
+esac

data/lib/util.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'fileutils'
+require 'pathname'
 
 module DockerMgr
 
@@ -7,17 +8,21 @@ module DockerMgr
 
     def root_dir 
       return @root_dir if @root_dir
-      error_message = "not within project tree"
-      curr_dir = Dir.pwd
-      return curr_dir if curr_dir.end_with? "/docker"
-      dir_parts = curr_dir.split "/docker/"
-      raise error_message if dir_parts == 1
-      possible_root = "#{dir_parts[0]}/docker"
-      raise error_message unless (Dir.entries(possible_root) && %w{admin backup apps}).length == 3
-      @root_dir = possible_root
+      search_dir = Dir.pwd
+      while search_dir && !root_dir_condition(search_dir)
+        parent = File.dirname(search_dir)
+        # project_root wird entweder der Root-pfad oder false. Wenn es false
+        # wird, bricht die Schleife ab. Vgl. Rails
+        search_dir = (parent != search_dir) && parent
+      end
+      project_root = search_dir if root_dir_condition(search_dir)
+      raise 'you are not within a presentation-project.' unless project_root
+      @root_dir = Pathname.new(File.realpath project_root)
     end
 
-
+    def root_dir_condition(search_dir)
+      search_dir.is_a?(String) && search_dir.end_with?("/docker") && (Dir.entries(search_dir) && %w{admin backup apps}).length == 3
+    end
 
     def backup_dir
       "#{root_dir}/backup" 
@@ -53,7 +58,7 @@ module DockerMgr
     end
 
 
-    
+
     def cert_dir
       "#{proxy_dir}/ca_certs"
     end
@@ -85,18 +90,18 @@ module DockerMgr
 
     def service_hooks_for(app_name,type)
       Dir.entries("#{apps_dir}/#{app_name}/administration/hooks/#{type}.d")
-      .select {| entry | !entry.start_with?(".") && entry != "before_all" && entry != "after_all" }
+        .select {| entry | !entry.start_with?(".") && entry != "before_all" && entry != "after_all" }
     end
 
     def services(app_name)
       YAML.load(File.read("#{apps_dir}/#{app_name}/docker-compose.yml"))
-      .each_key
-      .select {|k| !k.end_with?("data")}
+        .each_key
+        .select {|k| !k.end_with?("data")}
     end
 
     def data_services(app_name)
       YAML.load(File.read("#{apps_dir}/#{app_name}/docker-compose.yml")).each_key
-      .select {|k| k.end_with?("data")}
+        .select {|k| k.end_with?("data")}
     end
 
     def volumes(app_name,service_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockersitter
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Rene Richter
@@ -136,6 +136,7 @@ files:
 - lib/templates/admin/ca/sign.sh
 - lib/templates/admin/examples/postgres_backup
 - lib/templates/admin/examples/postgres_restore
+- lib/templates/admin/installation_scripts/install_curl.sh
 - lib/templates/admin/installation_scripts/install_derby.sh
 - lib/templates/admin/installation_scripts/install_git.sh
 - lib/templates/admin/installation_scripts/install_glassfish.sh
@@ -144,6 +145,7 @@ files:
 - lib/templates/admin/installation_scripts/install_rust.sh
 - lib/templates/admin/installation_scripts/scriptrunner.sh
 - lib/templates/admin/routines/backup_routine
+- lib/templates/admin/trust.sh
 - lib/templates/after_all.erb
 - lib/templates/after_all_restore.erb
 - lib/templates/backup.erb