RubyGems - shipitron - Versions diffs - 0.2.2 → 0.3.0 - Mend

shipitron 0.2.2 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml +4 -4
data/Dockerfile +8 -8
data/Dockerfile.release +9 -8
data/README.md +6 -4
data/lib/shipitron/consul_keys.rb +11 -0
data/lib/shipitron/server/deploy_application.rb +2 -0
data/lib/shipitron/server/update_deploy_ref.rb +36 -0
data/lib/shipitron/version.rb +1 -1
metadata +4 -3

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7653475a31f523308f996fcc6706ba164f1c0803
-  data.tar.gz: 9cfda8b85cb629ecaf060d9b56d741817426a80b
+  metadata.gz: f276eea3bc814eeedda43552b9c801662562f7b1
+  data.tar.gz: 129599725b7dfe76b22e1ddd3be38dfd9577a9c1
 SHA512:
-  metadata.gz: 1ae5bea9fc367cdd7d8cba5db9438f634ee4a1ad3fe438f36fa524f9a4df6b90312271f5e43113035917b471723971a6ba5c3380fdbafbea41845e9839f40c6a
-  data.tar.gz: a0002bf6452cf263af8ebf362b36b6a8917ac036979e5358e5fec47820b11349da0a6a1709ea3eb9b21cb670f9dd06160acf031fa625fbd1b8c621e848810e54
+  metadata.gz: 44af2826b1072da8b54808c86553fa6c093c3894f658cb54d03a2035eaa64950fef01a0df7c3a0369e6c902eaf9b3222300a63c062c4d45de916bb6c66c9ff02
+  data.tar.gz: 9098145bb5484b87ded3aafb2b88cc43ba0f41569ed96990222826e24ab87d777dc12c22d172287f4e8ebf068264133520830ec59f8588f23eaa237c030fac56

data/Dockerfile CHANGED Viewed

@@ -6,20 +6,20 @@ RUN addgroup -S shipitron && \
     addgroup -g 1101 docker && \
     addgroup shipitron docker
-ENV GOSU_VERSION 1.9
-ENV DUMB_INIT_VERSION 1.1.3
+ENV GOSU_VERSION 1.10
+ENV DUMB_INIT_VERSION 1.2.0
-RUN apk add --no-cache ca-certificates gnupg && \
+RUN apk add --no-cache ca-certificates gnupg openssl && \
     mkdir -p /tmp/build && \
     cd /tmp/build && \
     gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
-    curl -o gosu -L "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64" && \
-    curl -o gosu.asc -L "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64.asc" && \
+    wget -O gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64" && \
+    wget -O gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64.asc" && \
     gpg --verify gosu.asc && \
     chmod +x gosu && \
     cp gosu /bin/gosu && \
-    curl -O -L https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_amd64 && \
-    curl -O -L https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/sha256sums && \
+    wget https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_amd64 && \
+    wget https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/sha256sums && \
     grep dumb-init_${DUMB_INIT_VERSION}_amd64$ sha256sums | sha256sum -c && \
     chmod +x dumb-init_${DUMB_INIT_VERSION}_amd64 && \
     cp dumb-init_${DUMB_INIT_VERSION}_amd64 /bin/dumb-init && \
@@ -31,7 +31,7 @@ RUN apk add --no-cache ca-certificates gnupg && \
 RUN apk add --no-cache \
     build-base \
     git \
-    openssh \
+    openssh-client \
     perl \
     bash

data/Dockerfile.release CHANGED Viewed

@@ -6,20 +6,20 @@ RUN addgroup -S shipitron && \
     addgroup -g 1101 docker && \
     addgroup shipitron docker
-ENV GOSU_VERSION 1.9
-ENV DUMB_INIT_VERSION 1.1.3
+ENV GOSU_VERSION 1.10
+ENV DUMB_INIT_VERSION 1.2.0
-RUN apk add --no-cache ca-certificates gnupg && \
+RUN apk add --no-cache ca-certificates gnupg openssl && \
     mkdir -p /tmp/build && \
     cd /tmp/build && \
     gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
-    curl -o gosu -L "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64" && \
-    curl -o gosu.asc -L "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64.asc" && \
+    wget -O gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64" && \
+    wget -O gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64.asc" && \
     gpg --verify gosu.asc && \
     chmod +x gosu && \
     cp gosu /bin/gosu && \
-    curl -O -L https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_amd64 && \
-    curl -O -L https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/sha256sums && \
+    wget https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_amd64 && \
+    wget https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/sha256sums && \
     grep dumb-init_${DUMB_INIT_VERSION}_amd64$ sha256sums | sha256sum -c && \
     chmod +x dumb-init_${DUMB_INIT_VERSION}_amd64 && \
     cp dumb-init_${DUMB_INIT_VERSION}_amd64 /bin/dumb-init && \
@@ -31,12 +31,13 @@ RUN apk add --no-cache ca-certificates gnupg && \
 RUN apk add --no-cache \
     build-base \
     git \
+    openssh-client \
     perl \
     bash
 WORKDIR /app
-ENV SHIPITRON_VERSION=0.2.2
+ENV SHIPITRON_VERSION=0.3.0
 RUN gem install shipitron -v ${SHIPITRON_VERSION} && \
     mkdir -p /home/shipitron/.ssh && \

data/README.md CHANGED Viewed

@@ -31,16 +31,18 @@ applications:
 - 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
+- Add deploy ref key to `shipitron/<app name>/deploy_ref_key`
 - `docker run -it --rm -v shipitron.yml:/shipitron/config/shipitron.yml outstand/shipitron:<version> deploy <app>`
 ## Development
 - `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 -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)
+- `docker run -it --rm -v $(pwd):/shipitron -v shipitron_fog:/fog -e FOG_LOCAL=true -w /shipitron outstand/shipitron:dev rspec spec` to run specs
+- `APP_PATH=/path/to/app`
+- `docker run -it --rm -v $(pwd):/shipitron -v $APP_PATH:/app outstand/shipitron:dev deploy <app>` to run client side
+- `docker run -it --rm -v $(pwd):/shipitron -v $APP_PATH:/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 $APP_PATH:/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/consul_keys.rb CHANGED Viewed

@@ -30,5 +30,16 @@ module Shipitron
       end
     end
+    def set_key(key:, value:)
+      Logger.debug "Setting key #{key}"
+      Diplomat::Kv.put(key, value)
+    end
+    def set_key!(key:, value:)
+      set_key(key: key, value: value).tap do |retval|
+        raise "Unable to set #{key}!" if retval != true
+      end
+    end
   end
 end

data/lib/shipitron/server/deploy_application.rb CHANGED Viewed

@@ -6,6 +6,7 @@ require 'shipitron/server/docker/build_image'
 require 'shipitron/server/docker/push_image'
 require 'shipitron/server/update_ecs_task_definitions'
 require 'shipitron/server/run_post_build'
+require 'shipitron/server/update_deploy_ref'
 require 'shipitron/server/update_ecs_services'
 module Shipitron
@@ -57,6 +58,7 @@ module Shipitron
         Docker::PushImage,
         UpdateEcsTaskDefinitions,
         RunPostBuild,
+        UpdateDeployRef,
         UpdateEcsServices
       ]

data/lib/shipitron/server/update_deploy_ref.rb ADDED Viewed

@@ -0,0 +1,36 @@
+require 'shipitron'
+require 'shipitron/consul_keys'
+module Shipitron
+  module Server
+    class UpdateDeployRef
+      include Metaractor
+      include ConsulKeys
+      required :application
+      required :docker_image
+      before do
+        configure_consul_client!
+      end
+      def call
+        Logger.info "Updating deploy ref to #{docker_image.tag}"
+        set_key!(key: deploy_ref_key, value: docker_image.tag)
+      end
+      private
+      def application
+        context.application
+      end
+      def docker_image
+        context.docker_image
+      end
+      def deploy_ref_key
+        fetch_key!(key: "shipitron/#{application}/deploy_ref_key")
+      end
+    end
+  end
+end

data/lib/shipitron/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Shipitron
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipitron
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -276,6 +276,7 @@ files:
 - lib/shipitron/server/git/upload_cache.rb
 - lib/shipitron/server/run_post_build.rb
 - lib/shipitron/server/transform_cli_args.rb
+- lib/shipitron/server/update_deploy_ref.rb
 - lib/shipitron/server/update_ecs_services.rb
 - lib/shipitron/server/update_ecs_task_definitions.rb
 - lib/shipitron/server/upload_build_cache.rb
@@ -303,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key:
 specification_version: 4
 summary: A deployment tool for use with Docker and ECS.