shipitron 1.1.0 → 1.3.2

data/lib/shipitron/server/download_build_cache.rb

@@ -1,5 +1,6 @@
 require 'shipitron'
 require 'shipitron/fetch_bucket'
+require 'shipitron/s3_copy'
 
 module Shipitron
   module Server
@@ -8,20 +9,28 @@ module Shipitron
 
       required :application
       required :s3_cache_bucket
+      required :build_cache_location
+      required :region
 
       def call
         Logger.info "Downloading build cache from bucket #{s3_cache_bucket}"
 
-        s3_file = bucket.files.get("#{application}.build-cache.tar.gz")
+        s3_file = bucket.files.head("#{application}.build-cache.archive")
         if s3_file.nil?
           Logger.warn 'Build cache not found.'
           return
         end
 
-        build_cache = Pathname.new("/home/shipitron/#{application}/tmp/build-cache.tar.gz")
+        build_cache = Pathname.new("/home/shipitron/#{application}/#{build_cache_location}")
         build_cache.parent.mkpath
-        build_cache.open('wb') do |local_file|
-          local_file.write(s3_file.body)
+
+        result = S3Copy.call(
+          source: "s3://#{s3_cache_bucket}/#{application}.build-cache.archive",
+          destination: build_cache.to_s,
+          region: context.region
+        )
+        if result.failure?
+          fail_with_error!(message: 'Failed to download build cache!')
         end
 
         Logger.info 'Download complete.'
@@ -36,6 +45,10 @@ module Shipitron
         context.s3_cache_bucket
       end
 
+      def build_cache_location
+        context.build_cache_location
+      end
+
       def bucket
         @bucket ||= FetchBucket.call!(name: s3_cache_bucket).bucket
       end

data/lib/shipitron/server/git/clone_local_copy.rb

@@ -1,5 +1,6 @@
 require 'shipitron'
 require 'shellwords'
+require 'shipitron/git_info'
 
 module Shipitron
   module Server
@@ -22,10 +23,8 @@ module Shipitron
           end
 
           Logger.info 'Using this git commit:'
-          FileUtils.cd("/home/shipitron/#{application}") do
-            context.git_sha = `git rev-parse --short=12 HEAD`.chomp
-            Logger.info `git --no-pager log --format='%aN (%h): %s' -n 1`.chomp
-          end
+          context.git_info = GitInfo.from_path(path: "/home/shipitron/#{application}")
+          Logger.info context.git_info.one_liner
         end
 
         private

data/lib/shipitron/server/git/update_cache.rb

@@ -25,6 +25,7 @@ module Shipitron
           else
             Logger.info 'Fetching new git commits'
             FileUtils.cd('/home/shipitron/git-cache') do
+              `git gc --auto`
               `git fetch -f #{Shellwords.escape repository_url} #{Shellwords.escape repository_branch}:#{Shellwords.escape repository_branch}`
             end
           end

data/lib/shipitron/server/run_post_build.rb

@@ -9,6 +9,7 @@ module Shipitron
 
       required :region
       required :clusters
+      required :git_info
       optional :post_builds
 
       def call
@@ -26,7 +27,41 @@ module Shipitron
                 container_overrides: [
                   {
                     name: post_build.container_name,
-                    command: post_build.command_ary
+                    command: post_build.command_ary,
+                    environment: [
+                      {
+                        name: "GIT_SHA",
+                        value: git_info.sha
+                      },
+                      {
+                        name: "GIT_SHORT_SHA",
+                        value: git_info.short_sha
+                      },
+                      {
+                        name: "GIT_EMAIL",
+                        value: git_info.email
+                      },
+                      {
+                        name: "GIT_NAME",
+                        value: git_info.name
+                      },
+                      {
+                        name: "GIT_MESSAGE",
+                        value: git_info.summary
+                      },
+                      {
+                        name: "GIT_TIMESTAMP",
+                        value: git_info.timestamp
+                      },
+                      {
+                        name: "GIT_BRANCH",
+                        value: git_info.branch
+                      },
+                      {
+                        name: "GIT_TAG",
+                        value: git_info.tag
+                      }
+                    ]
                   }
                 ]
               },
@@ -75,6 +110,10 @@ module Shipitron
       def clusters
         context.clusters
       end
+
+      def git_info
+        context.git_info
+      end
     end
   end
 end

data/lib/shipitron/server/transform_cli_args.rb

@@ -12,7 +12,9 @@ module Shipitron
       required :application
       required :repository_url
       optional :repository_branch
+      optional :registry
       required :s3_cache_bucket
+      required :build_cache_location
       required :image_name
       required :named_tag
       required :region
@@ -22,6 +24,7 @@ module Shipitron
       optional :ecs_services
       optional :ecs_service_templates
       optional :build_script
+      optional :skip_push, default: false
       optional :post_builds
 
       before do
@@ -36,12 +39,15 @@ module Shipitron
           application
           repository_url
           repository_branch
+          registry
           s3_cache_bucket
+          build_cache_location
           named_tag
           region
           clusters
           ecs_services
           build_script
+          skip_push
         ].each_with_object(cli_args) { |k, args| args[k] = context[k] }
 
         cli_args.docker_image = DockerImage.new(name: context.image_name)

data/lib/shipitron/server/update_ecs_task_definitions.rb

@@ -14,11 +14,12 @@ module Shipitron
       required :docker_image
       required :ecs_task_defs
       optional :ecs_task_def_templates
+      optional :registry
 
       before do
         context.ecs_task_def_templates ||= []
         context.templates = context.ecs_task_def_templates
-        context.template_context = { tag: docker_image.tag }
+        context.template_context = { tag: docker_image.tag, registry: context.registry }
       end
 
       organize [

data/lib/shipitron/server/upload_build_cache.rb

@@ -8,21 +8,27 @@ module Shipitron
 
       required :application
       required :s3_cache_bucket
+      required :build_cache_location
+      required :region
 
       def call
         Logger.info "Uploading build cache to bucket #{s3_cache_bucket}"
 
-        build_cache = Pathname.new("/home/shipitron/#{application}/tmp/build-cache.tar.gz")
+        build_cache = Pathname.new("/home/shipitron/#{application}/#{build_cache_location}")
         unless build_cache.exist?
           Logger.warn 'Build cache not found.'
           return
         end
 
-        build_cache.open('rb') do |local_file|
-          bucket.files.create(
-            key: "#{application}.build-cache.tar.gz",
-            body: local_file.read
-          )
+        result = S3Copy.call(
+          source: build_cache.to_s,
+          destination: "s3://#{s3_cache_bucket}/#{application}.build-cache.archive",
+          region: context.region
+        )
+        if result.failure?
+          Logger.warn 'Failed to upload build cache!'
+        else
+          Logger.info 'Upload complete.'
         end
       end
 
@@ -35,8 +41,8 @@ module Shipitron
         context.s3_cache_bucket
       end
 
-      def bucket
-        @bucket ||= FetchBucket.call!(name: s3_cache_bucket).bucket
+      def build_cache_location
+        context.build_cache_location
       end
     end
   end

data/lib/shipitron/version.rb

@@ -1,3 +1,3 @@
 module Shipitron
-  VERSION = '1.1.0'
+  VERSION = '1.3.2'
 end

data/scripts/docker-entrypoint.sh

@@ -1,6 +1,15 @@
 #!/bin/sh
 set -e
 
+chown_dir() {
+  dir=$1
+  if [ "$(stat -c %u ${dir})" = '0' ]; then
+    chown -R shipitron:shipitron $dir
+  fi
+}
+
+chown_dir /home/shipitron
+
 if [ -n "$USE_BUNDLE_EXEC" ]; then
   BINARY="bundle exec shipitron"
 else

data/shipitron.gemspec

@@ -17,21 +17,23 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'thor', '~> 0.20'
+  spec.add_runtime_dependency 'thor', '~> 1.0'
   spec.add_runtime_dependency 'aws-sdk-ecs', '~> 1.8'
-  spec.add_runtime_dependency 'hashie', '~> 3.5'
-  spec.add_runtime_dependency 'metaractor', '~> 0.5'
+  spec.add_runtime_dependency 'hashie', '~> 4.1'
+  spec.add_runtime_dependency 'metaractor', '~> 3.0'
   spec.add_runtime_dependency 'diplomat', '~> 2.0'
-  spec.add_runtime_dependency 'fog-aws', '~> 2.0'
+  spec.add_runtime_dependency 'fog-aws', '~> 3.6'
   spec.add_runtime_dependency 'mime-types', '~> 3.1'
   spec.add_runtime_dependency 'minitar', '~> 0.6'
   spec.add_runtime_dependency 'mustache', '~> 1.0'
   spec.add_runtime_dependency 'tty-command', '~> 0.7'
   spec.add_runtime_dependency 'tty-table', '~> 0.9'
   spec.add_runtime_dependency 'pastel', '~> 0.7'
+  spec.add_runtime_dependency 'excon', '~> 0.76'
+  spec.add_runtime_dependency 'rugged', '~> 1.0'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "pry-byebug", "~> 3.5"
   spec.add_development_dependency "rspec", "~> 3.7"
   spec.add_development_dependency "fivemat", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipitron
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Ryan Schlesinger
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: metaractor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -178,34 +178,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.76'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.76'
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +290,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-description: 
+description:
 email:
 - ryan@outstand.com
 executables:
@@ -271,6 +299,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".dockerignore"
+- ".gitattributes"
 - ".gitignore"
 - ".rspec"
 - Dockerfile
@@ -280,9 +309,11 @@ files:
 - README.md
 - Rakefile
 - build_dev.sh
+- docker-compose.yml
 - exe/shipitron
 - lib/shipitron.rb
 - lib/shipitron/cli.rb
+- lib/shipitron/client.rb
 - lib/shipitron/client/bootstrap_application.rb
 - lib/shipitron/client/create_ecs_services.rb
 - lib/shipitron/client/deploy_application.rb
@@ -299,10 +330,13 @@ files:
 - lib/shipitron/ecs_client.rb
 - lib/shipitron/ecs_task_def.rb
 - lib/shipitron/fetch_bucket.rb
+- lib/shipitron/find_docker_volume_name.rb
+- lib/shipitron/git_info.rb
 - lib/shipitron/logger.rb
 - lib/shipitron/mustache_yaml_parser.rb
 - lib/shipitron/parse_templates.rb
 - lib/shipitron/post_build.rb
+- lib/shipitron/s3_copy.rb
 - lib/shipitron/server/deploy_application.rb
 - lib/shipitron/server/docker/build_image.rb
 - lib/shipitron/server/docker/configure.rb
@@ -331,7 +365,7 @@ files:
 homepage: https://github.com/outstand/shipitron
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -346,9 +380,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A deployment tool for use with Docker and ECS.
 test_files: []