shipitron 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8942009b3ccf99e9b14c8676e355c8a8cd22d7def515a2903daf6707e476a235
-  data.tar.gz: 3f1d602aebc48bdc3fda47458da830626c964320b621d6d21cf0db08dfef50a1
+  metadata.gz: 9bd4d376f639bb5ebd80df8a467b8aaca8eac7f2d50ebb6a404683dbaea2fde5
+  data.tar.gz: d368aa28072880ae2580ed73fca2c78d40328b497d21d3a1d02139ccdfd77af5
 SHA512:
-  metadata.gz: 8e0a2d2d5575272eada04e2cb8b836a2a71a5139e992714bec2ba45ed83dd3d0b6c7821eb92e824c4f8bcba9805f707be1b56e65d95b3ad87b69b40403758f5e
-  data.tar.gz: 45f1cdf8c7d940e0defc1ef6be4d65f772648b6c7e7d5d8759f3e19043e426d262a435a5e282eb7fd6872536041f02429d1c3822cc78979dbc444c9c53713c7c
+  metadata.gz: 26eafd5c78aafa2946e78e400e0c132820ca9b7b57dbbf0846fce2e11f290db649c7257ffb76283fa2bd86176fe38fe322a79077836ef9afd1eaefa306b43a3d
+  data.tar.gz: cf99dd7b011c3beb293b428418930f55aa0990a73027deda2c6c1b7e6d420db7b5584af89457acc0a0318553ebc0ed3bc53c3f18d49860c5c947647164f2ea9f

data/Dockerfile.release

@@ -22,7 +22,7 @@ RUN apk add --no-cache \
 
 WORKDIR /app
 
-ENV SHIPITRON_VERSION=1.1.0
+ENV SHIPITRON_VERSION=1.2.0
 
 RUN gem install shipitron -v ${SHIPITRON_VERSION} && \
     mkdir -p /home/shipitron/.ssh && \

data/README.md

@@ -9,6 +9,7 @@ applications:
   dummy-app:
     repository: git@github.com:outstand/dummy-app
     cache_bucket: bucket
+    build_cache_location: tmp/build-cache.tar.gz
     image_name: outstand/dummy-app
     build_script: shipitron/build.sh
     post_builds:
@@ -51,4 +52,6 @@ To release a new version:
 - `docker run -it --rm -v ~/.gitconfig:/root/.gitconfig -v ~/.gitconfig.user:/root/.gitconfig.user -v ~/.ssh/id_rsa:/root/.ssh/id_rsa -v ~/.gem:/root/.gem -w /shipitron outstand/shipitron:dev rake release`
 - `docker build -t outstand/shipitron:VERSION -f Dockerfile.release .`
 - `docker push outstand/shipitron:VERSION`
+- `docker tag outstand/shipitron:VERSION outstand/shipitron:latest`
+- `docker push outstand/shipitron:latest`
 - Update ECS task definition with new version

data/lib/shipitron/cli.rb

@@ -63,6 +63,7 @@ module Shipitron
     option :repository, required: true
     option :repository_branch, default: 'master'
     option :bucket, required: true
+    option :build_cache_location, default: 'tmp/build-cache.tar.gz'
     option :image_name, required: true
     option :named_tag, default: 'latest'
     option :region, required: true
@@ -86,6 +87,7 @@ module Shipitron
         repository_url: options[:repository],
         repository_branch: options[:repository_branch],
         s3_cache_bucket: options[:bucket],
+        build_cache_location: options[:build_cache_location],
         image_name: options[:image_name],
         named_tag: options[:named_tag],
         region: options[:region],

data/lib/shipitron/client/load_application_config.rb

@@ -12,6 +12,7 @@ module Shipitron
         context.repository_url = config.repository
         context.repository_branch = config.repository_branch
         context.s3_cache_bucket = config.cache_bucket
+        context.build_cache_location = config.build_cache_location
         context.image_name = config.image_name
         context.named_tag = begin
                               if config.named_tag.nil?

data/lib/shipitron/client/run_ecs_tasks.rb

@@ -16,6 +16,7 @@ module Shipitron
       required :shipitron_task
       required :repository_url
       required :s3_cache_bucket
+      required :build_cache_location
       required :image_name
       required :named_tag
       required :ecs_task_defs
@@ -108,6 +109,7 @@ module Shipitron
           '--name', context.application,
           '--repository', context.repository_url,
           '--bucket', context.s3_cache_bucket,
+          '--build-cache-location', context.build_cache_location,
           '--image-name', context.image_name,
           '--named-tag', context.named_tag,
           '--region', cluster.region,

data/lib/shipitron/server/deploy_application.rb

@@ -19,6 +19,7 @@ module Shipitron
       required :application
       required :repository_url
       required :s3_cache_bucket
+      required :build_cache_location
       required :docker_image
       required :named_tag
       required :region

data/lib/shipitron/server/download_build_cache.rb

@@ -8,17 +8,18 @@ module Shipitron
 
       required :application
       required :s3_cache_bucket
+      required :build_cache_location
 
       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.get("#{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)
@@ -36,6 +37,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/transform_cli_args.rb

@@ -13,6 +13,7 @@ module Shipitron
       required :repository_url
       optional :repository_branch
       required :s3_cache_bucket
+      required :build_cache_location
       required :image_name
       required :named_tag
       required :region
@@ -37,6 +38,7 @@ module Shipitron
           repository_url
           repository_branch
           s3_cache_bucket
+          build_cache_location
           named_tag
           region
           clusters

data/lib/shipitron/server/upload_build_cache.rb

@@ -8,11 +8,12 @@ module Shipitron
 
       required :application
       required :s3_cache_bucket
+      required :build_cache_location
 
       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
@@ -20,7 +21,7 @@ module Shipitron
 
         build_cache.open('rb') do |local_file|
           bucket.files.create(
-            key: "#{application}.build-cache.tar.gz",
+            key: "#{application}.build-cache.archive",
             body: local_file.read
           )
         end
@@ -35,6 +36,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipitron
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor