shipitron 0.4.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 428064c728cfd00ba1807fa1a655c1649a78323ea98f85be6f71baf6ae939892
-  data.tar.gz: facdb618cffd2c41256e40c436daf6fc6fb906073919959a9c21982dd0c95bee
+  metadata.gz: feb18a95f97617bac70d81fa89272203c5ee7aafc2e13f83f0f26bfd12bfbbd8
+  data.tar.gz: 66c40b51b8802ea914d40e8a5738066c1d3789c47ea92fcdb346e00bbf9de87c
 SHA512:
-  metadata.gz: 88cf5a283cd744f88721e63f908c12964bfa2831fc51890d98dd5e28446c2e83a03c51bdec3cf2fa6c04acb5e234db4e3451a1e38c795d70e7ead705ac51b0db
-  data.tar.gz: e2a23cbc284326a66f49d60f7823ed5151e702b63e0bc9c111564a48649bdce7f9e8f18dd07bf7e6bc947b0272e7dadabb984efda647e958cb84e1ceefd4a0b9
+  metadata.gz: 544be4870e87d518c4ac12cc0deb607921ca8f1972b970981d5e9a2ad6b00df43caed53cce5faed0627a088d1036ff8d59fd600780fed8261b2c0906b979abca
+  data.tar.gz: d935dfb8223048b941e5c77819b3e22ba9676c9f8df88ef0f97940efaf7db6772659de84e23e4755c7274032329b324c992909198d458739f10c254d2af51e4c

data/Dockerfile

@@ -16,24 +16,7 @@ RUN addgroup -S shipitron && \
 ENV GOSU_VERSION 1.10
 ENV DUMB_INIT_VERSION 1.2.0
 
-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 && \
-    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 && \
-    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 && \
-    cd /tmp && \
-    rm -rf /tmp/build && \
-    apk del gnupg && \
-    rm -rf /root/.gnupg
+RUN apk add --no-cache ca-certificates openssl tini su-exec
 
 RUN apk add --no-cache \
     build-base \
@@ -63,6 +46,5 @@ RUN ln -s /shipitron/exe/shipitron /usr/local/bin/shipitron && \
 
 COPY scripts/docker-entrypoint.sh /docker-entrypoint.sh
 
-ENV DUMB_INIT_SETSID 0
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "-g", "--", "/docker-entrypoint.sh"]
 CMD ["help"]

data/Dockerfile.release

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

data/README.md

@@ -36,14 +36,14 @@ applications:
 - `./build_dev.sh`
 - `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 -v $(pwd):/shipitron -v $HOME/.config/shipitron:/home/shipitron/.config/shipitron -v $APP_PATH:/app outstand/shipitron:dev deploy <app>` to run client side
+- `docker run -it --rm -v $(pwd):/shipitron -v $HOME/.config/shipitron:/home/shipitron/.config/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)
 
 Running a dev version in production:
 - `docker push outstand/shipitron:dev`
 - Update config to use `shipitron_task: shipitron-dev`
-- `docker run -it --rm -v $(pwd):/shipitron -v $APP_PATH:/app outstand/shipitron:dev deploy <app> --debug`
+- `docker run -it --rm -v $(pwd):/shipitron -v $HOME/.config/shipitron:/home/shipitron/.config/shipitron -v $APP_PATH:/app outstand/shipitron:dev deploy <app> --debug`
 
 To release a new version:
 - Update the version number in `version.rb` and `Dockerfile.release` and commit the result.

data/lib/shipitron.rb

@@ -6,7 +6,7 @@ require 'shipitron/smash'
 
 module Shipitron
   CONFIG_FILE = 'shipitron/config.yml'.freeze
-  SECRETS_FILE = 'shipitron/secrets.yml'.freeze
+  SECRETS_FILE = '~/.config/shipitron/secrets.yml'.freeze
 
   class << self
     def config_file
@@ -18,7 +18,7 @@ module Shipitron
     end
 
     def config
-      @config ||= Smash.load(config_file).merge(secrets)
+      @config ||= Smash.load(Pathname.new(config_file).expand_path.to_s).merge(secrets)
     rescue ArgumentError
       Logger.warn "Config file '#{config_file}' does not exist"
       @config = secrets
@@ -33,7 +33,7 @@ module Shipitron
     end
 
     def secrets
-      @secrets ||= Smash.load(secrets_file)
+      @secrets ||= Smash.load(Pathname.new(secrets_file).expand_path.to_s)
     rescue ArgumentError
       Logger.warn "Secrets file '#{secrets_file}' does not exist"
       @secrets = Smash.new

data/lib/shipitron/cli.rb

@@ -11,7 +11,7 @@ module Shipitron
 
     desc 'deploy <app>', 'Deploys the app'
     option :config_file, default: 'shipitron/config.yml'
-    option :secrets_file, default: 'shipitron/secrets.yml'
+    option :secrets_file, default: '~/.config/shipitron/secrets.yml'
     option :debug, type: :boolean, default: false
     option :simulate, type: :boolean, default: false
     def deploy(app)
@@ -49,7 +49,7 @@ module Shipitron
     option :ecs_service_templates, type: :array, default: []
     option :build_script, default: nil
     option :post_builds, type: :array
-    option :secrets_file, default: 'shipitron/secrets.yml'
+    option :secrets_file, default: '~/.config/shipitron/secrets.yml'
     option :debug, type: :boolean, default: false
     def server_deploy
       setup(
@@ -93,7 +93,7 @@ module Shipitron
     option :service_count, type: :numeric, default: 0
     option :task_def_dir, default: 'shipitron/ecs_task_defs'
     option :service_dir, default: 'shipitron/ecs_services'
-    option :secrets_file, default: 'shipitron/secrets.yml'
+    option :secrets_file, default: '~/.config/shipitron/secrets.yml'
     option :debug, type: :boolean, default: false
     def bootstrap(app)
       setup(

data/lib/shipitron/version.rb

@@ -1,3 +1,3 @@
 module Shipitron
-  VERSION = '0.4.1'
+  VERSION = '1.0.0'
 end

data/scripts/docker-entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/dumb-init /bin/sh
+#!/bin/sh
 set -e
 
 if [ -n "$USE_BUNDLE_EXEC" ]; then
@@ -8,7 +8,7 @@ else
 fi
 
 if ${BINARY} help "$1" 2>&1 | grep -q "shipitron $1"; then
-  set -- gosu shipitron ${BINARY} "$@"
+  set -- su-exec shipitron ${BINARY} "$@"
 
   if [ -n "$FOG_LOCAL" ]; then
     chown -R shipitron:shipitron /fog

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipitron
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -346,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A deployment tool for use with Docker and ECS.