shiprails 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e2ede56c490aa668c0d17af629f8d095314b6ad
-  data.tar.gz: a565762fba4e21a5c310e277e706dd7e4c5608b8
+  metadata.gz: 199f498599a6374fa1b2284831eee49fe875ff62
+  data.tar.gz: 4b1541a027c16b5d2880d38d39cc085649bf2f13
 SHA512:
-  metadata.gz: 3a10a1125890cbc0670f478c38401b4c4b9aab06edee38c3066c443bf93f62c476a964d393ce6cf59157f6c445a27cb6c943b649f8980ea2444ad336a0a65fdd
-  data.tar.gz: 7ea1841019fbc871bb435929ad322b907ea1132611075b881a9e6df7afe070e55aab8f8b748b9efa9b567dd9e84bc9dd3e75b6c3092b42530ebadb0147ac9aca
+  metadata.gz: bec3817f21f519c608486a463fd2c7364d09e55a30548a1b397fd8f99a46a8c0f23cfc09dc22ac44496c02a52f647754b8eb3b6acf3abb6985f3ecd285eccf55
+  data.tar.gz: 56cb41cf6eb9a30c04bad41c449279cae65e61760defe79b59e20549f1c6d0ee8219f4aaf83323de7bbbb8c0b937791cdd45307bd27e8b4e5433abd3bcc3acae

data/lib/shiprails/ship/deploy.rb

@@ -33,12 +33,32 @@ module Shiprails
               s3 = Aws::S3::Client.new(region: region_name.to_s)
               objects = s3.list_objects_v2(bucket: s3_config_bucket, prefix: environment_name)
               s3_config_revision = objects.contents.map{ |object| object.key[/\d+/].to_i }.max || 0
-              commands << "docker build -t #{image_name}_#{environment_name} --build-arg AWS_ACCESS_KEY_ID='#{aws_access_key_id}' --build-arg AWS_SECRET_ACCESS_KEY='#{aws_access_key_secret}' --build-arg AWS_REGION='#{region_name.to_s}' --build-arg S3_CONFIG_BUCKET='#{s3_config_bucket}' --build-arg S3_CONFIG_ENVIRONMENT='#{environment_name}' --build-arg S3_CONFIG_REVISION='#{s3_config_revision}' -f Dockerfile.production ."
+              ecr = Aws::ECR::Client.new({ region: region_name.to_s })
+              authorization_data = ecr.get_authorization_token.authorization_data.first
+              credentials = Base64.decode64(authorization_data.authorization_token).split(':')
+              exit(1) unless run "docker login -u #{credentials.first} -p #{credentials.last} -e none #{authorization_data.proxy_endpoint}"
+              repository_name = region[:repository_url].split('/').drop(1).join('/')
+              images = ecr.describe_images(repository_name: repository_name).image_details
+              tags = images.map(&:image_tags).flatten
+              shas = git.log(1000).map(&:sha) # get last 1000 commits
+              last_built_sha = nil
+              shas.each do |sha|
+                if tags.include?(sha)
+                  last_built_sha = sha
+                  break
+                end
+              end
+              unless last_built_sha.nil?
+                exit(1) unless run "docker pull #{region[:repository_url]}:#{last_built_sha}"
+              end
+              commands << "docker build -t #{image_name}_#{environment_name} --build-arg AWS_ACCESS_KEY_ID='#{aws_access_key_id}' --build-arg AWS_SECRET_ACCESS_KEY='#{aws_access_key_secret}' --build-arg AWS_REGION='#{region_name.to_s}' --build-arg S3_CONFIG_BUCKET='#{s3_config_bucket}' --build-arg S3_CONFIG_ENVIRONMENT='#{environment_name}' --build-arg S3_CONFIG_REVISION='#{s3_config_revision}' -f #{dockerfile_path} ."
             end
           end
         end
         commands.uniq!
-        commands.each { |c| run c } # TODO: check that this succeeded
+        commands.each do |c|
+          exit(1) unless run c
+        end
         say "Build complete", :green
       end
 
@@ -56,7 +76,9 @@ module Shiprails
           end
         end
         commands.uniq!
-        commands.each { |c| run c } # TODO: check that this succeeded
+        commands.each do |c|
+          exit(1) unless run c
+        end
         say "Tagging complete.", :green
       end
 
@@ -72,8 +94,8 @@ module Shiprails
           ecr = Aws::ECR::Client.new({ region: region.to_s })
           authorization_data = ecr.get_authorization_token.authorization_data.first
           credentials = Base64.decode64(authorization_data.authorization_token).split(':')
-          run "docker login -u #{credentials.first} -p #{credentials.last} -e none #{authorization_data.proxy_endpoint}"
-          run "docker push #{repository_url}:#{git_sha}" # TODO: check that this succeeded
+          exit(1) unless run "docker login -u #{credentials.first} -p #{credentials.last} -e none #{authorization_data.proxy_endpoint}"
+          exit(1) unless run "docker push #{repository_url}:#{git_sha}"
         end
         say "Push complete.", :green
       end
@@ -177,6 +199,10 @@ module Shiprails
         YAML.load(File.read("#{options[:path]}/.shiprails.yml")).deep_symbolize_keys
       end
 
+      def dockerfile_path
+        configuration[:dockerfile_path] || "Dockerfile.production"
+      end
+
       def git
         @_git ||= Git.open(Dir.getwd)
       end

data/lib/shiprails/version.rb

@@ -1,3 +1,3 @@
 module Shiprails
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiprails
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Zane Shannon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport