dockersitter 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce908ad9ece66790ea14cee9c0521058e856de75
-  data.tar.gz: 6725a7bbf1c16a1fbb877e06ff42a1bc3eb862e5
+  metadata.gz: c2aa31dc030ca5da6c465bf31e3e8658ce57cafa
+  data.tar.gz: d63ce2038c4617bfff1faa73763c95b9e3f0dfe3
 SHA512:
-  metadata.gz: 9f7d05560345c1a52464c36720b96476932407f96381f0f31f395880f617b8cbba819c977cb95c6ff98f9816e26fb6abc65e7ec023418706d4d4d757ade9f529
-  data.tar.gz: 290b08eef9ff70812e5eb03133e742f44520e4afd99840a46851c8941581297c2bacfc8fcff518b5acd656c752f99bee5123d86b8ebb00dcef32c1d50b2f3de4
+  metadata.gz: d828014ebd3a3d5feef01be03a1e20e93df8685970ef8f4397cb6c3f55422ef6d44dee157820137a62909c223056b2ee53bd4e9b1d091fb3957e567e09260d16
+  data.tar.gz: 46927e3ecfc850320a1921a0febf9d1a684f1c61d91c3135ccf4439541d0caa6c2d9d866fb6d3586fee72e3438c89b27e9d90ed3c0a78ae99dd3219978102ecf

data/.gitignore

@@ -3,3 +3,5 @@ html/
 pkg/
 vendor/cache/*.gem
 config.yml
+
+**/*.DS_Store

data/lib/commands/create.rb

@@ -49,29 +49,58 @@ class Create < Thor
     empty_directory "#{app_path}/administration/installation"
     empty_directory "#{app_path}/administration/hooks/backup.d"
     empty_directory "#{app_path}/administration/hooks/restore.d"
-
     template "Dockerfile.erb","#{app_path}/Dockerfile" if options[:dockerfile]
-    unless options[:packages].empty?
-      options[:packages].each do |package|
-        FileUtils.ln("#{install_dir}/install_#{package}.sh", 
-                     "#{app_path}/administration/installation/install_#{package}.sh")
-      end
-
-      FileUtils.ln("#{install_dir}/scriptrunner.sh", 
-                   "#{app_path}/administration/scriptrunner.sh")
-      
-    end
-    append_to_file "#{routine_dir}/backup_routine", "docker_mgr backup_app #{app_name}"
+    add_packages(app_path,options[:packages]) unless options[:packages].empty?
+    append_to_file "#{routine_dir}/backup_routine", "dockersitter backup_app #{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 "runner RUNNER_NAME", "create a new runner."
+  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 => ["./data:/data"]
+  option :base,
+    :type => :string,
+    :desc => "the image which the runner is based on.",
+    :aliases => 'b',
+    :default => "runner_base:1.0"
+  option :serve_name,
+    :type => :string,
+    :desc => 'the ci-server, the runner belongs to',
+    :aliases => 's',
+    :default => "gitlab.#{config[:host]}/ci"
+  option :token,
+    :type => :string,
+    :desc => 'the token to register this runner',
+    :aliases => 't',
+    :required => true
+  def runner(runner_name,token)
+    @app_name = runner_name
+    @user_email,@user_name = config.values_at(:email,:name)
+    @base = options[:base]
+    runner_path = "#{runner_dir}/#{@app_name}"
+    template "docker-compose.yml.erb","#{runner_path}/docker-compose.yml"
+    empty_directory "#{runner_path}/administration/installation"
+    template "Dockerfile.erb","#{app_path}/Dockerfile" if options[:dockerfile]
+    add_packages(runner_path,options[:packages]) unless options[:packages].empty?
+    FileUtils.cd(runner_path) do 
+      command = %Q(register --non-interactive 
+                   --url "https://#{options['server_name']}" 
+                   --registration-token "#{options['token']}" 
+                   --description "multi-runner" 
+                   --executor "shell")
+      puts `docker-compose run service #{command}`
+    end
+  end
+
   desc "image IMAGE_NAME","creates a new image."
   def image(image_name)
     @user_email,@user_name = config.values_at(:email,:name)
@@ -79,21 +108,12 @@ class Create < Thor
     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.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")
-      empty_directory("#{image_path}/administration/certificates")
-    end
+    add_packages(image_path) unless options[:packages].empty?
+    add_trust(image_path)
     @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/delete.rb

@@ -12,7 +12,7 @@ class Delete < Thor
     choice = ask "do you want to remove #{@app_name}? (y,N)"
     abort "aborting" unless choice == 'y'
     FileUtils.cd "#{apps_dir}/#{@app_name}" do
-      puts `echo y | sudo docker-compose rm` 
+      puts `docker-compose -f rm` 
     end
     puts `tar -zcf #{attic_dir}/#{@app_name}.tar -C #{apps_dir} #{@app_name}`
     FileUtils.rm_rf "#{apps_dir}/#{@app_name}"

data/lib/commands/init.rb

@@ -20,36 +20,51 @@ class Init < Thor::Group
     empty_directory "docker/proxy/certs"
     empty_directory "docker/proxy/vhosts.d"
     copy_file "gitignore","docker/.gitignore"
+  end
+
+  def create_ca
     FileUtils.cd 'docker/admin/ca' do 
       puts `openssl req -x509 -newkey rsa:4096 -keyout rootCA.key -out rootCA.crt -days 7800 -sha256`
     end
     chmod 'docker/admin/ca/rootCA.key',0600
     chmod 'docker/admin/ca/sign.sh',0755
-    puts `git init docker`
     FileUtils.cd 'docker' do 
       generate_ca_installer
-      image_name = 'base'
-      @user_email,@user_name = config.values_at(:email,:name)
-      image_path = "#{base_images_dir}/#{image_name}/v1.0"
+    end
+  end
+
+  def init_git
+    puts `git init docker`
+  end
+
+  def create_base_image
+    @user_email,@user_name = config.values_at(:email,:name)
+    image_name = 'base'
+    image_path = "#{base_images_dir}/#{image_name}/v1.0"
+    @image_name = image_name
+    @version = "1.0"
+    @base = "ubuntu:14.04"
+    create_image(image_path,'curl','git')
+  end
+
+  def create_base_runner
+    @image_name = 'runner_base'
+    image_path = "#{base_images_dir}/#{@image_name}/v1.0"
+    @version = "1.0"
+    @base = "ayufan/gitlab-ci-multi-runner:latest"
+    create_image(image_path,'java','node','ruby','ruby_buildtools','node_buildtools')
+  end
+
+  no_tasks do
+    def create_image(image_path,*packages)
       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")
+      add_packages(image_path,*packages)
       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

data/lib/commands/restore_app.rb

@@ -51,6 +51,6 @@ class RestoreApp < Thor::Group
       puts exec_hook(@app_name,"restore","after_all")
     end
 
-    `sudo rm -rf #{app_backup_tmp_dir}`
+    `rm -rf #{app_backup_tmp_dir}`
   end
 end

data/lib/commands/start.rb

@@ -22,7 +22,7 @@ class Start < Thor::Group
     def start_app(app_name)
       app_path = "#{apps_dir}/#{app_name}"
       FileUtils.cd app_path do
-        puts `sudo docker-compose up -d`
+        puts `docker-compose up -d`
       end
     end
   end

data/lib/docker_mgr/version.rb

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

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

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+npm install -g bower grunt gulp

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

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+
+gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+
+curl -sSL https://get.rvm.io | bash -s stable --ruby
+
+

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

@@ -0,0 +1,2 @@
+#!/bin/bash
+gem install bundler rake

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

@@ -13,7 +13,6 @@ if [ $LAST_CHAR != "/" ]; then
 	DIR=$DIR/;
 fi
 
-for f in $DIR*
-do
+for f in $(ls $DIR*| sort -t _ -k 1 -g); do 
 	sh $f;
 done

data/lib/util.rb

@@ -31,6 +31,10 @@ module DockerMgr
     def base_images_dir
       "#{root_dir}/base_images"
     end
+    
+    def runner_dir
+      "#{root_dir}/ci_runner"
+    end
 
 
     def attic_dir
@@ -167,7 +171,19 @@ module DockerMgr
       end
     end
 
-
+    def add_packages(path,*packages) 
+      packages.each_with_index do |package,index|
+        FileUtils.cp("#{install_dir}/install_#{package}.sh", 
+                     "#{path}/administration/installation/#{index}_install_#{package}.sh")
+      end
+      FileUtils.cp("#{install_dir}/scriptrunner.sh", 
+                   "#{path}/administration/scriptrunner.sh")
+    end
+    def add_trust(path)
+      FileUtils.cp("#{admin_dir}/trust.sh", 
+                   "#{path}/administration/trust.sh")
+      empty_directory("#{path}/administration/certificates")
+    end
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockersitter
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Rene Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -119,7 +119,6 @@ files:
 - gemspec.yml
 - install_certificate.tar
 - lib/command_router.rb
-- lib/commands/.generate.rb.swp
 - lib/commands/backup_app.rb
 - lib/commands/config.rb
 - lib/commands/create.rb
@@ -142,6 +141,9 @@ files:
 - lib/templates/admin/installation_scripts/install_glassfish.sh
 - lib/templates/admin/installation_scripts/install_java.sh
 - lib/templates/admin/installation_scripts/install_node.sh
+- lib/templates/admin/installation_scripts/install_node_buildtools.sh
+- lib/templates/admin/installation_scripts/install_ruby.sh
+- lib/templates/admin/installation_scripts/install_ruby_buildtools.sh
 - lib/templates/admin/installation_scripts/install_rust.sh
 - lib/templates/admin/installation_scripts/scriptrunner.sh
 - lib/templates/admin/routines/backup_routine