shipitron 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26404f4e8acd7b859cc8dc2e74a399ccb08ff293
-  data.tar.gz: 5654cccd96d69d418e468f1a95217d89000f6edf
+  metadata.gz: 1e83f5c7899e1c6504e2a25641a696c88bd4091c
+  data.tar.gz: 8e971e38cad347535d1efee0dbd2b8f11fc51713
 SHA512:
-  metadata.gz: 24a5b2934c357f1204d315c32c7fcba122aad527e165feb4015c5b44f77335f7e7ed5226833216417da210711077204ce9d93f0c7d779ca454781be8713f40ff
-  data.tar.gz: b1978b9a83fae96d8c7d992253f46e0d4ebd87a3943080bdb0d697c36677100a6a27498376d48b415eb58ea690528abc38b6a5080b4eb5045f4ef6cafe97adea
+  metadata.gz: dd2e50644045a6da76e406840a0ddc7123766911f3ad29635516987544e8e52a38b737b75b1e23fe1520d0b8e5af6af79a3a6166cfb2dca3dd6060b080ff7d83
+  data.tar.gz: 526452513f64ffc57f7c74e4b0e7800951a24b60ee07c7d1c02630bc25d607b4d54724fd662850f07ec5efbd260cfb1eece8e97410faf425f4258a1673106f53

data/Dockerfile.release

@@ -29,13 +29,14 @@ RUN apk add --no-cache ca-certificates gnupg && \
     rm -rf /root/.gnupg
 
 RUN apk add --no-cache \
+    build-base \
     git \
     perl \
     bash
 
 WORKDIR /app
 
-ENV SHIPITRON_VERSION=0.2.0
+ENV SHIPITRON_VERSION=0.2.1
 
 RUN gem install shipitron -v ${SHIPITRON_VERSION} && \
     mkdir -p /home/shipitron/.ssh && \

data/README.md

@@ -28,6 +28,9 @@ applications:
 ```
 
 - Create shipitron.yml file
+- Add needed ssh known hosts to `shipitron/<app name>/git_host_key` in consul k/v
+- Add git ssh deploy key to `shipitron/<app name>/git_deploy_key` in consul k/v
+- Add docker auth config (`~/.docker/config.json` after `docker login`) to `shipitron/<app name>/docker_auth` in consul k/v
 - `docker run -it --rm -v shipitron.yml:/shipitron/config/shipitron.yml outstand/shipitron:<version> deploy <app>`
 
 ## Development
@@ -35,9 +38,9 @@ applications:
 - `docker volume create --name shipitron_fog`
 - `./build_dev.sh`
 - `docker run -it --rm -v $(pwd):/shipitron -v shipitron_fog:/fog -e FOG_LOCAL=true outstand/shipitron:dev rspec spec` to run specs
-- `docker run -it --rm -v $(pwd):/shipitron outstand/shipitron:dev deploy <app>` to run client side
-- `docker run -it --rm -v $(pwd):/shipitron outstand/shipitron:dev deploy <app> --simulate` to get the arguments for `server_deploy` below
-- `docker run -it --rm --dns 10.10.10.2 -v /path/to/shipitron:/shipitron -v $(pwd):/app -v /bin/docker:/bin/docker -v /var/run/docker.sock:/var/run/docker.sock -v shipitron_fog:/fog -e FOG_LOCAL=true -e CONSUL_HOST=consul outstand/shipitron:dev server_deploy --name dummy-app --repository git@github.com:outstand/dummy-app --bucket outstand-shipitron --image-name outstand/dummy-app --region us-east-1 --cluster-name us-east-1-prod-blue --ecs-task-defs dummy-app --ecs-services dummy-app --build-script shipitron/build.sh --post-builds 'ecs_task:dummy-app,container_name:dummy-app,command:echo postbuild' --ecs-task-def-templates LS0tCmZhbWlseTogZHVtbXktYXBwCmNvbnRhaW5lcl9kZWZpbml0aW9uczoKICAtIG5hbWU6IGR1bW15LWFwcAogICAgaW1hZ2U6IG91dHN0YW5kL2R1bW15LWFwcDp7e3RhZ319CiAgICBtZW1vcnk6IDEyOAogICAgZXNzZW50aWFsOiB0cnVlCiAgICBwb3J0X21hcHBpbmdzOgogICAgICAtIGNvbnRhaW5lcl9wb3J0OiA4MAogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gbmFtZTogU0VSVklDRV84MF9OQU1FCiAgICAgICAgdmFsdWU6IGR1bW15Cg== --ecs-service-templates LS0tCmNsdXN0ZXI6IHt7Y2x1c3Rlcn19CnNlcnZpY2VfbmFtZTogZHVtbXktYXBwCnRhc2tfZGVmaW5pdGlvbjogZHVtbXktYXBwe3tyZXZpc2lvbn19CmRlc2lyZWRfY291bnQ6IHt7Y291bnR9fQojcm9sZToge3tyb2xlfX0KZGVwbG95bWVudF9jb25maWd1cmF0aW9uOgogIG1heGltdW1fcGVyY2VudDogMjAwCiAgbWluaW11bV9oZWFsdGh5X3BlcmNlbnQ6IDUwCg== --debug` to run server side (dummy-app is an example)
+- `docker run -it --rm -v $(pwd):/shipitron -v /path/to/app:/app outstand/shipitron:dev deploy <app>` to run client side
+- `docker run -it --rm -v $(pwd):/shipitron -v /path/to/app:/app outstand/shipitron:dev deploy <app> --simulate` to get the arguments for `server_deploy` below
+- `docker run -it --rm --dns 10.10.10.2 -v $(pwd):/shipitron -v /path/to/app:/app -v /bin/docker:/bin/docker -v /var/run/docker.sock:/var/run/docker.sock -v shipitron_fog:/fog -e FOG_LOCAL=true -e CONSUL_HOST=consul outstand/shipitron:dev server_deploy --name dummy-app --repository git@github.com:outstand/dummy-app --bucket outstand-shipitron --image-name outstand/dummy-app --region us-east-1 --cluster-name us-east-1-prod-blue --ecs-task-defs dummy-app --ecs-services dummy-app --build-script shipitron/build.sh --post-builds 'ecs_task:dummy-app,container_name:dummy-app,command:echo postbuild' --ecs-task-def-templates LS0tCmZhbWlseTogZHVtbXktYXBwCmNvbnRhaW5lcl9kZWZpbml0aW9uczoKICAtIG5hbWU6IGR1bW15LWFwcAogICAgaW1hZ2U6IG91dHN0YW5kL2R1bW15LWFwcDp7e3RhZ319CiAgICBtZW1vcnk6IDEyOAogICAgZXNzZW50aWFsOiB0cnVlCiAgICBwb3J0X21hcHBpbmdzOgogICAgICAtIGNvbnRhaW5lcl9wb3J0OiA4MAogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gbmFtZTogU0VSVklDRV84MF9OQU1FCiAgICAgICAgdmFsdWU6IGR1bW15Cg== --ecs-service-templates LS0tCmNsdXN0ZXI6IHt7Y2x1c3Rlcn19CnNlcnZpY2VfbmFtZTogZHVtbXktYXBwCnRhc2tfZGVmaW5pdGlvbjogZHVtbXktYXBwe3tyZXZpc2lvbn19CmRlc2lyZWRfY291bnQ6IHt7Y291bnR9fQojcm9sZToge3tyb2xlfX0KZGVwbG95bWVudF9jb25maWd1cmF0aW9uOgogIG1heGltdW1fcGVyY2VudDogMjAwCiAgbWluaW11bV9oZWFsdGh5X3BlcmNlbnQ6IDUwCg== --debug` to run server side (dummy-app is an example)
 
 To release a new version:
 - Update the version number in `version.rb` and `Dockerfile.release` and commit the result.

data/lib/shipitron/cli.rb

@@ -39,14 +39,14 @@ module Shipitron
     desc 'server_deploy', 'Server-side component of deploy'
     option :name, required: true
     option :repository, required: true
-    option :branch, default: 'master'
+    option :repository_branch, default: 'master'
     option :bucket, required: true
     option :image_name, required: true
     option :region, required: true
     option :cluster_name, required: true
     option :ecs_task_defs, type: :array, required: true
     option :ecs_task_def_templates, type: :array, default: []
-    option :ecs_services, type: :array, required: true
+    option :ecs_services, type: :array, default: []
     option :ecs_service_templates, type: :array, default: []
     option :build_script, default: nil
     option :post_builds, type: :array
@@ -61,7 +61,7 @@ module Shipitron
       cli_args = Server::TransformCliArgs.call!(
         application: options[:name],
         repository_url: options[:repository],
-        repository_branch: options[:branch],
+        repository_branch: options[:repository_branch],
         s3_cache_bucket: options[:bucket],
         image_name: options[:image_name],
         region: options[:region],

data/lib/shipitron/client/load_application_config.rb

@@ -10,6 +10,7 @@ module Shipitron
 
       def call
         context.repository_url = config.repository
+        context.repository_branch = config.repository_branch
         context.s3_cache_bucket = config.cache_bucket
         context.image_name = config.image_name
         context.build_script = config.build_script

data/lib/shipitron/client/load_templates.rb

@@ -6,7 +6,7 @@ module Shipitron
       include Metaractor
 
       required :ecs_task_def_dir
-      required :ecs_service_dir
+      optional :ecs_service_dir
 
       def call
         context.ecs_task_def_templates = load_templates(ecs_task_def_dir)
@@ -23,6 +23,8 @@ module Shipitron
       end
 
       def load_templates(dir)
+        return [] if dir.nil?
+
         search_path = Pathname.new(dir)
         unless search_path.directory?
           fail_with_error!(

data/lib/shipitron/client/run_ecs_tasks.rb

@@ -17,15 +17,17 @@ module Shipitron
       required :image_name
       required :ecs_task_defs
       optional :ecs_task_def_templates
-      required :ecs_services
+      optional :ecs_services
       optional :ecs_service_templates
       optional :build_script
       optional :post_builds
       optional :simulate
+      optional :repository_branch
 
       before do
         context.post_builds ||= []
         context.ecs_task_def_templates ||= []
+        context.ecs_services ||= []
         context.ecs_service_templates ||= []
       end
 
@@ -103,8 +105,10 @@ module Shipitron
           ary << '--ecs-task-defs'
           ary.concat(context.ecs_task_defs.each {|s| escape(s)})
 
-          ary << '--ecs-services'
-          ary.concat(context.ecs_services.each {|s| escape(s)})
+          unless context.ecs_services.empty?
+            ary << '--ecs-services'
+            ary.concat(context.ecs_services.each {|s| escape(s)})
+          end
 
           if context.build_script != nil
             ary.concat ['--build-script', escaped(:build_script)]
@@ -125,6 +129,10 @@ module Shipitron
             ary.concat(context.ecs_service_templates.map {|t| Base64.urlsafe_encode64(t)})
           end
 
+          unless context.repository_branch.nil?
+            ary.concat ['--repository-branch', escaped(:repository_branch)]
+          end
+
           if simulate?
             Logger.info "server_deploy command: #{ary.join(' ')}"
           else

data/lib/shipitron/server/deploy_application.rb

@@ -23,7 +23,7 @@ module Shipitron
       required :cluster_name
       required :ecs_task_defs
       optional :ecs_task_def_templates
-      required :ecs_services
+      optional :ecs_services
       optional :ecs_service_templates
       optional :build_script
       optional :post_builds

data/lib/shipitron/server/run_post_build.rb

@@ -48,6 +48,7 @@ module Shipitron
                 cluster: cluster_name,
                 tasks: [task_arn]
               )
+              next if response.tasks.empty?
               Logger.info "Task status: #{response.tasks.first.last_status}"
               break if response.tasks.first.last_status == 'STOPPED'.freeze
               sleep 1

data/lib/shipitron/server/transform_cli_args.rb

@@ -18,7 +18,7 @@ module Shipitron
       required :cluster_name
       required :ecs_task_defs
       optional :ecs_task_def_templates
-      required :ecs_services
+      optional :ecs_services
       optional :ecs_service_templates
       optional :build_script
       optional :post_builds

data/lib/shipitron/server/update_ecs_services.rb

@@ -10,15 +10,21 @@ module Shipitron
 
       required :region
       required :cluster_name
-      required :ecs_services
+      optional :ecs_services
       required :ecs_task_defs
       optional :ecs_service_templates
 
       before do
+        context.ecs_services ||= []
         context.ecs_service_templates ||= []
       end
 
       def call
+        if ecs_services.empty?
+          Logger.info 'No ECS services to update.'
+          return
+        end
+
         Logger.info "Updating ECS services [#{ecs_services.join(', ')}] with task definitions [#{ecs_task_defs.map(&:to_s).join(', ')}]"
 
         begin

data/lib/shipitron/version.rb

@@ -1,3 +1,3 @@
 module Shipitron
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipitron
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor