shipitron 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f04072c2df6e1b7392cb15089b399abe2e34a4bc
-  data.tar.gz: 286fec71017bed29169b35f22ef88b5d2f5d1533
+  metadata.gz: 7b4ac38c06b7175cd6cd6afa86db5a58f1720685
+  data.tar.gz: 132599f283d1b3d2c4af7109e7234ce767f4a244
 SHA512:
-  metadata.gz: 9d26aa307c3d20f376b90ad4f900df77a5fdd834eec2b7342c5f2842629586ce29d6a0762c6cccb4d165399f9f451ca39768e6637ee491a478f5f397c6df93ea
-  data.tar.gz: d302045e2344adb07067911ba1ae9ff11a858f309a75222f87c75f7a4f5cebb80c2f0a05d17d55c8083776d49279ac8f185fdddf835f36e21fe0d263f0f396e9
+  metadata.gz: ba91de68f68176fb983e12cbb708c708f65986641b8d9cc219a59954b01c4d2a694b1f0ddf61cc9352788d5a457c65efb358a2a41e6aa35225c56dc6bdbde499
+  data.tar.gz: c9da9482a2b85247c3b9da71c3c553b57a5138d70d84d4d12e9a631cecf9d79438fede1aa0761ae5b274f4b2dc6408523ec61b39218d3a2ab906bff657e28ae2

data/.gitignore

@@ -2,3 +2,4 @@
 /pkg/
 Gemfile.lock
 /tmp/
+/cache/

data/Dockerfile

@@ -1,4 +1,11 @@
-FROM ruby:2.3.1-alpine
+FROM ruby:2.4.1-alpine as cache
+COPY cache/ /tmp/
+RUN   cd /usr/local/bundle && \
+    ([ -f /tmp/bundler-data.tar.gz ] && \
+    tar -zxf /tmp/bundler-data.tar.gz && \
+    rm /tmp/bundler-data.tar.gz) || true
+
+FROM ruby:2.4.1-alpine
 MAINTAINER Ryan Schlesinger <ryan@outstand.com>
 
 RUN addgroup -S shipitron && \
@@ -33,7 +40,10 @@ RUN apk add --no-cache \
     git \
     openssh-client \
     perl \
-    bash
+    bash \
+    curl \
+    wget \
+    jq
 
 ENV USE_BUNDLE_EXEC true
 ENV BUNDLE_GEMFILE /shipitron/Gemfile
@@ -41,11 +51,9 @@ ENV BUNDLE_GEMFILE /shipitron/Gemfile
 WORKDIR /app
 COPY Gemfile shipitron.gemspec /shipitron/
 COPY lib/shipitron/version.rb /shipitron/lib/shipitron/
-COPY scripts/fetch-bundler-data.sh /shipitron/scripts/fetch-bundler-data.sh
 
-ARG bundler_data_host
-RUN /shipitron/scripts/fetch-bundler-data.sh ${bundler_data_host} && \
-      (bundle check || bundle install) && \
+COPY --from=cache /usr/local/bundle /usr/local/bundle
+RUN (bundle check || bundle install) && \
       git config --global push.default simple
 COPY . /shipitron/
 RUN ln -s /shipitron/exe/shipitron /usr/local/bin/shipitron && \

data/Dockerfile.release

@@ -1,4 +1,4 @@
-FROM ruby:2.3.1-alpine
+FROM ruby:2.4.1-alpine
 MAINTAINER Ryan Schlesinger <ryan@outstand.com>
 
 RUN addgroup -S shipitron && \
@@ -33,11 +33,14 @@ RUN apk add --no-cache \
     git \
     openssh-client \
     perl \
-    bash
+    bash \
+    curl \
+    wget \
+    jq
 
 WORKDIR /app
 
-ENV SHIPITRON_VERSION=0.3.3
+ENV SHIPITRON_VERSION=0.3.4
 
 RUN gem install shipitron -v ${SHIPITRON_VERSION} && \
     mkdir -p /home/shipitron/.ssh && \

data/build_dev.sh

@@ -3,17 +3,11 @@ set -e -x
 
 build_image=outstand/shipitron:dev
 dockerfile=Dockerfile
-bundler_data_dir=tmp
+bundler_data_dir=cache
 
-bundler_data_container=''
 tar_container=''
 
 function cleanup {
-  if [ -n "$bundler_data_container" ]; then
-    docker stop bundler-data
-    docker rm -fv bundler-data
-  fi
-
   if [ -n "$tar_container" ]; then
     docker rm -fv ${tar_container}
   fi
@@ -26,12 +20,6 @@ trap cleanup EXIT
 build_args=''
 mkdir -p ${bundler_data_dir}
 
-if [ -f $(pwd)/${bundler_data_dir}/bundler-data.tar.gz ]; then
-  docker run --name bundler-data -v $(pwd)/${bundler_data_dir}/bundler-data.tar.gz:/usr/share/nginx/html/bundler-data.tar.gz:ro -d nginx:stable-alpine
-  bundler_data_container=bundler-data
-  build_args="--build-arg bundler_data_host=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' bundler-data)"
-fi
-
 docker build -t ${build_image} -f ${dockerfile} ${build_args} .
 
 docker run -t --cidfile=${bundler_data_dir}/cidfile -w /usr/local/bundle ${build_image} tar -zcf /tmp/bundler-data.tar.gz .

data/lib/shipitron/server/docker/run_build_script.rb

@@ -24,9 +24,12 @@ module Shipitron
             unless Pathname.new(build_script).exist?
               fail_with_error!(message: "#{build_script} does not exist")
             end
-            Logger.info `#{build_script} #{docker_image}`
-            if $? != 0
-              fail_with_error!(message: "build script exited with non-zero code: #{$?}")
+
+            cmd = TTY::Command.new
+            result = cmd.run!("#{build_script} #{docker_image}")
+
+            if result.failure?
+              fail_with_error!(message: "build script exited with non-zero code: #{result.exit_status}")
             end
           end
         end

data/lib/shipitron/version.rb

@@ -1,3 +1,3 @@
 module Shipitron
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/shipitron.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'mime-types', '~> 3.0'
   spec.add_runtime_dependency 'minitar', '~> 0.5'
   spec.add_runtime_dependency 'mustache', '~> 1.0'
+  spec.add_runtime_dependency 'tty-command', '~> 0.6'
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipitron
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: tty-command
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +297,6 @@ files:
 - lib/shipitron/smash.rb
 - lib/shipitron/version.rb
 - scripts/docker-entrypoint.sh
-- scripts/fetch-bundler-data.sh
 - shipitron.gemspec
 homepage: https://github.com/outstand/shipitron
 licenses: []
@@ -304,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A deployment tool for use with Docker and ECS.

data/scripts/fetch-bundler-data.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-set -x
-
-if [ -z "$1" ]; then
-  echo 'Missing argument: bundler data host'
-  exit 0
-fi
-
-wget -T 2 -O /tmp/bundler-data.tar.gz http://${1}/bundler-data.tar.gz
-if [ $? -ne 0 ]; then
-  echo 'Unable to fetch bundler data.'
-else
-  cd /usr/local/bundle && \
-    tar -zxf /tmp/bundler-data.tar.gz && \
-    rm /tmp/bundler-data.tar.gz
-fi