shiprails 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199f498599a6374fa1b2284831eee49fe875ff62
-  data.tar.gz: 4b1541a027c16b5d2880d38d39cc085649bf2f13
+  metadata.gz: 56ad943e3c31dce558f301d17f74d3fe9ee8fd66
+  data.tar.gz: 78cb95e986707c421b314be374cddd56c36d9d4e
 SHA512:
-  metadata.gz: bec3817f21f519c608486a463fd2c7364d09e55a30548a1b397fd8f99a46a8c0f23cfc09dc22ac44496c02a52f647754b8eb3b6acf3abb6985f3ecd285eccf55
-  data.tar.gz: 56cb41cf6eb9a30c04bad41c449279cae65e61760defe79b59e20549f1c6d0ee8219f4aaf83323de7bbbb8c0b937791cdd45307bd27e8b4e5433abd3bcc3acae
+  metadata.gz: 443405a53e8790d41e9df6c24bc08d8ff7d39b16b10804723af482271a7a4d7853c41924674d7056a8709ffe7e28cb74244a2fa8063355b85bb8582a3ab2c324
+  data.tar.gz: 7402c82fcb9ace723ef6fa623b7e9faf9087d008de371e1c58dc03e3e9c79bd28c2724c47c2fca1c18159c5673c8a49a3017a5d4bd2922a19503cf8737019085

data/lib/shiprails/ship/deploy.rb

@@ -22,6 +22,7 @@ module Shiprails
       end
 
       def build_docker_images
+        perform_callbacks :before_build_docker_images
         say "Building images..."
         s3_config_bucket = configuration[:config_s3_bucket].to_s
         commands = []
@@ -36,7 +37,7 @@ module Shiprails
               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}"
+              exit(1) unless run "docker login -u #{credentials.first} -p #{credentials.last} #{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
@@ -60,9 +61,11 @@ module Shiprails
           exit(1) unless run c
         end
         say "Build complete", :green
+        perform_callbacks :after_build_docker_images
       end
 
       def tag_docker_images
+        perform_callbacks :before_tag_docker_images
         say "Tagging images..."
         commands = []
         configuration[:services].each do |service_name, service|
@@ -80,9 +83,11 @@ module Shiprails
           exit(1) unless run c
         end
         say "Tagging complete.", :green
+        perform_callbacks :after_tag_docker_images
       end
 
       def push_docker_images
+        perform_callbacks :before_push_docker_images
         say "Pushing images..."
         repository_urls_to_regions = {}
         configuration[:services].each do |service_name, service|
@@ -94,13 +99,15 @@ 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(':')
-          exit(1) unless run "docker login -u #{credentials.first} -p #{credentials.last} -e none #{authorization_data.proxy_endpoint}"
+          exit(1) unless run "docker login -u #{credentials.first} -p #{credentials.last} #{authorization_data.proxy_endpoint}"
           exit(1) unless run "docker push #{repository_url}:#{git_sha}"
         end
         say "Push complete.", :green
+        perform_callbacks :after_push_docker_images
       end
 
       def update_ecs_tasks
+        perform_callbacks :before_update_ecs_tasks
         say "Updating ECS tasks..."
         configuration[:services].each do |service_name, service|
           image_name = "#{project_name}_#{service_name}"
@@ -144,9 +151,11 @@ module Shiprails
           end
         end
         say "ECS tasks updated.", :green
+        perform_callbacks :after_update_ecs_tasks
       end
 
       def update_ecs_services
+        perform_callbacks :before_update_ecs_services
         say "Updating ECS services..."
         configuration[:services].each do |service_name, service|
           service[:regions].each do |region_name, region|
@@ -179,6 +188,7 @@ module Shiprails
           end
         end
         say "ECS services updated.", :green
+        perform_callbacks :after_update_ecs_services
       end
 
       def done
@@ -203,6 +213,10 @@ module Shiprails
         configuration[:dockerfile_path] || "Dockerfile.production"
       end
 
+      def environment
+        args.first
+      end
+
       def git
         @_git ||= Git.open(Dir.getwd)
       end
@@ -223,6 +237,17 @@ module Shiprails
         configuration[:config_s3_bucket]
       end
 
+      def perform_callbacks(stage_name)
+        @_callbacks ||= configuration[:callbacks] || {}
+        if @_callbacks.key?(stage_name)
+          command = @_callbacks[stage_name]
+          wrapped_command = "ship exec -e #{environment} #{command}"
+          say "#{stage_name.to_s}: #{wrapped_command}"
+          result = run(wrapped_command)
+          exit(1) unless result
+        end
+      end
+
     end
   end
 end

data/lib/shiprails/ship/exec.rb

@@ -162,7 +162,7 @@ module Shiprails
         # sleep 5 # AWS just needs a little bit to setup networking
         say "Connecting #{ssh_user}@#{ec2_instance.public_ip_address}..."
         say "Executing: $ #{command_string}"
-        system "ssh -o ConnectTimeout=15 -o 'StrictHostKeyChecking no' -t -i #{ssh_private_key_path} #{ssh_user}@#{ec2_instance.public_ip_address} '#{command_string}'"
+        system "ssh -o ConnectTimeout=15 -o 'StrictHostKeyChecking no' -t -i #{ssh_private_key_path} #{ssh_user}@#{ec2_instance.public_ip_address} '`aws ecr get-login --region #{region}` && #{command_string}'"
       rescue => e
         puts e.inspect
         say "Error: #{e.message}", :red

data/lib/shiprails/version.rb

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

metadata

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