shipitron 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffcd046204b230e7282508063bb33a58c1c68e73c4e7c8546ea15cfc48d6a2f7
-  data.tar.gz: 38ddb0adc7677e27c9afcee285d09358afb60df254994d456319bf904d518091
+  metadata.gz: ce2ad45258aa11acc35b0c3041aab0fe3f20bb56f076764120f1b6466233f310
+  data.tar.gz: 938b06da85c43614c316c7d63a755440e8d7d61e6396ee0bc574040fda9bd817
 SHA512:
-  metadata.gz: 28b568e8e1a5fa928beeeaf2ff1e00415671712c9415dacc317581d10d79bb320bbc05f07d9d1c7b528db4a5523f9568cb9dac33d2bc5607165b43d1896d3cc4
-  data.tar.gz: fcd1597703388b9bf8be61ab98e03faabbcf17bab98a06895344e14cb41f3ee412941fe2a27257425c3db646762130500e592150c53e35520939d04240f77fe6
+  metadata.gz: 5a93f308e3065ada355022a5a18977d903e00ae56387e98218bf26557101ca8ccbb1a2d7c1950c6c2849b0bc47da860a57dccb6d0365216df99670a90245ce2c
+  data.tar.gz: 2a041845cb6bc87c29366de8e39702fb691bec9efb7a2e53df8673d30bbd9988edaa3147fe68a98c09fe6be80b81aa8a3094ded4fef464df23622c421ea63017

data/.buildkite/pipeline.yml

@@ -0,0 +1,94 @@
+env:
+  BUILDKITE_PLUGIN_DOCKER_CACHE_S3_BUCKET: "outstand-buildkite-cache"
+  # BUILDKITE_PLUGIN_DOCKER_CACHE_VOLUME_DEBUG: "true"
+  BUILDKITE_PLUGIN_DOCKER_COMPOSE_SHELL: "false"
+  # BUILDKITE_PLUGIN_DOCKER_COMPOSE_UPLOAD_CONTAINER_LOGS: "always"
+  BUILDKITE_PLUGIN_DOCKER_COMPOSE_PULL_RETRIES: 5
+  BUILDKITE_PLUGIN_DOCKER_COMPOSE_PUSH_RETRIES: 5
+  PLUGIN_DOCKER_COMPOSE_VERSION: "17bac3aaee1360e39381b89bb45513b11838238e"
+  PLUGIN_DOCKER_CACHE_VERSION: "f3d8feb52a25c69c75565e9f0b80375eae51850a"
+
+steps:
+  - label: ":docker: Build"
+    key: build
+    plugins:
+      - seek-oss/aws-sm#v2.2.1:
+          env:
+            DOCKER_LOGIN_PASSWORD: "/buildkite/docker_password"
+
+      - docker-login#v2.0.1:
+          username: outstandci
+
+      - ecr#v2.1.1:
+          login: true
+          region: "us-east-1"
+
+      - https://github.com/outstand/docker-compose-buildkite-plugin.git#${PLUGIN_DOCKER_COMPOSE_VERSION}:
+          build: specs
+          image-repository: 786715713882.dkr.ecr.us-east-1.amazonaws.com/ci-images
+          config:
+            - docker-compose.yml
+            - test.yml
+
+  - label: ":bundler: :rubygems:"
+    key: bundle_install
+    command: bundle install
+    depends_on: build
+    plugins:
+      - seek-oss/aws-sm#v2.2.1:
+          env:
+            DOCKER_LOGIN_PASSWORD: "/buildkite/docker_password"
+
+      - docker-login#v2.0.1:
+          username: outstandci
+
+      - ecr#v2.1.1:
+          login: true
+          region: "us-east-1"
+
+      - https://github.com/outstand/docker-compose-buildkite-plugin.git#${PLUGIN_DOCKER_COMPOSE_VERSION}:
+          run: specs
+          dependencies: false
+          config:
+            - docker-compose.yml
+            - test.yml
+
+      - https://github.com/outstand/docker-cache-buildkite-plugin.git#${PLUGIN_DOCKER_CACHE_VERSION}:
+          name: bundler-cache
+          keys:
+            - v1-bundler-cache-{{ arch }}-{{ checksum "shipitron.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-bundler-cache-{{ arch }}-
+          save: true
+          volumes:
+            - bundler-data
+
+  - label: ":ruby: Specs"
+    command: rspec spec
+    depends_on: bundle_install
+    plugins:
+      - seek-oss/aws-sm#v2.2.1:
+          env:
+            DOCKER_LOGIN_PASSWORD: "/buildkite/docker_password"
+          json-to-env:
+            - secret-id: "/buildkite/rails/env_vars"
+
+      - docker-login#v2.0.1:
+          username: outstandci
+
+      - ecr#v2.1.1:
+          login: true
+          region: "us-east-1"
+
+      - https://github.com/outstand/docker-compose-buildkite-plugin.git#${PLUGIN_DOCKER_COMPOSE_VERSION}:
+          run: specs
+          config:
+            - docker-compose.yml
+            - test.yml
+
+      - https://github.com/outstand/docker-cache-buildkite-plugin.git#${PLUGIN_DOCKER_CACHE_VERSION}:
+          name: bundler-cache
+          keys:
+            - v1-bundler-cache-{{ arch }}-{{ checksum "shipitron.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-bundler-cache-{{ arch }}-
+          volumes:
+            - bundler-data

data/.rspec

@@ -1,3 +1,4 @@
 --color
 --require spec_helper
 --format Fivemat
+--format RSpec::Buildkite::AnnotationFormatter

data/Deskfile

@@ -0,0 +1,15 @@
+function bundle() {
+  dev run --rm shipitron bundle "$@"
+}
+
+function shipitron() {
+  dev run --rm shipitron "$@"
+}
+
+function rspec() {
+  dev run --rm specs rspec "$@"
+}
+
+function release_gem() {
+  dev run --rm release_gem
+}

data/Dockerfile

@@ -1,11 +1,6 @@
-FROM ruby:2.7.2-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 outstand/fixuid as fixuid
 
-FROM ruby:2.7.2-alpine
+FROM ruby:2.7.3-alpine
 LABEL maintainer="Ryan Schlesinger <ryan@outstand.com>"
 
 RUN addgroup -S shipitron && \
@@ -29,12 +24,19 @@ RUN apk add --no-cache \
     jq \
     cmake
 
-ENV ECR_CREDENTIAL_HELPER_VERSION 0.4.0
+COPY --from=fixuid /usr/local/bin/fixuid /usr/local/bin/fixuid
+RUN chmod 4755 /usr/local/bin/fixuid && \
+      USER=shipitron && \
+      GROUP=shipitron && \
+      mkdir -p /etc/fixuid && \
+      printf "user: $USER\ngroup: $GROUP\n" > /etc/fixuid/config.yml
+
+ENV ECR_CREDENTIAL_HELPER_VERSION 0.5.0
 RUN cd /usr/local/bin && \
       wget https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/${ECR_CREDENTIAL_HELPER_VERSION}/linux-amd64/docker-credential-ecr-login && \
       chmod +x docker-credential-ecr-login
 
-ENV BUILDKIT_VERSION v0.7.2
+ENV BUILDKIT_VERSION v0.8.3
 RUN cd /usr/local/bin && \
       wget -nv https://github.com/moby/buildkit/releases/download/${BUILDKIT_VERSION}/buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz && \
       tar --strip-components=1 -zxvf buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz bin/buildctl && \
@@ -42,7 +44,7 @@ RUN cd /usr/local/bin && \
       rm -f buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz
 
 USER shipitron
-ENV BUILDX_VERSION v0.4.2
+ENV BUILDX_VERSION v0.5.1
 RUN cd /home/shipitron && \
       wget -nv https://github.com/docker/buildx/releases/download/${BUILDX_VERSION}/buildx-${BUILDX_VERSION}.linux-amd64 && \
       mkdir -p ~/.docker/cli-plugins && \
@@ -53,16 +55,16 @@ USER root
 ENV USE_BUNDLE_EXEC true
 ENV BUNDLE_GEMFILE /shipitron/Gemfile
 
+ENV BUNDLER_VERSION 2.2.21
+RUN gem install bundler -v ${BUNDLER_VERSION} -i /usr/local/lib/ruby/gems/$(ls /usr/local/lib/ruby/gems) --force
+
 WORKDIR /app
 COPY Gemfile shipitron.gemspec /shipitron/
 COPY lib/shipitron/version.rb /shipitron/lib/shipitron/
 
-COPY --from=cache /usr/local/bundle /usr/local/bundle
-RUN (bundle check || bundle install) && \
-      git config --global push.default simple
+RUN git config --global push.default simple
 COPY . /shipitron/
-RUN ln -s /shipitron/exe/shipitron /usr/local/bin/shipitron && \
-    mkdir -p /home/shipitron/.ssh && \
+RUN mkdir -p /home/shipitron/.ssh && \
     chown shipitron:shipitron /home/shipitron/.ssh && \
     chmod 700 /home/shipitron/.ssh
 

data/Dockerfile.release

@@ -1,4 +1,4 @@
-FROM ruby:2.7.2-alpine
+FROM ruby:2.7.3-alpine
 LABEL maintainer="Ryan Schlesinger <ryan@outstand.com>"
 
 RUN addgroup -S shipitron && \
@@ -21,12 +21,12 @@ RUN apk add --no-cache \
     jq \
     cmake
 
-ENV ECR_CREDENTIAL_HELPER_VERSION 0.4.0
+ENV ECR_CREDENTIAL_HELPER_VERSION 0.5.0
 RUN cd /usr/local/bin && \
       wget https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/${ECR_CREDENTIAL_HELPER_VERSION}/linux-amd64/docker-credential-ecr-login && \
       chmod +x docker-credential-ecr-login
 
-ENV BUILDKIT_VERSION v0.7.2
+ENV BUILDKIT_VERSION v0.8.3
 RUN cd /usr/local/bin && \
       wget -nv https://github.com/moby/buildkit/releases/download/${BUILDKIT_VERSION}/buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz && \
       tar --strip-components=1 -zxvf buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz bin/buildctl && \
@@ -34,7 +34,7 @@ RUN cd /usr/local/bin && \
       rm -f buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz
 
 USER shipitron
-ENV BUILDX_VERSION v0.4.2
+ENV BUILDX_VERSION v0.5.1
 RUN cd /home/shipitron && \
       wget -nv https://github.com/docker/buildx/releases/download/${BUILDX_VERSION}/buildx-${BUILDX_VERSION}.linux-amd64 && \
       mkdir -p ~/.docker/cli-plugins && \
@@ -45,14 +45,14 @@ USER root
 
 WORKDIR /app
 
-ENV SHIPITRON_VERSION=1.3.2
+ENV SHIPITRON_VERSION=1.4.0
 
 RUN gem install shipitron -v ${SHIPITRON_VERSION} && \
     mkdir -p /home/shipitron/.ssh && \
     chown shipitron:shipitron /home/shipitron/.ssh && \
     chmod 700 /home/shipitron/.ssh
 
-COPY scripts/docker-entrypoint.sh /docker-entrypoint.sh
+COPY scripts/release-entrypoint.sh /docker-entrypoint.sh
 
 ENTRYPOINT ["/sbin/tini", "-g", "--", "/docker-entrypoint.sh"]
 CMD ["help"]

data/Dockerfile.staging

@@ -0,0 +1,70 @@
+FROM ruby:2.7.3-alpine
+LABEL maintainer="Ryan Schlesinger <ryan@outstand.com>"
+
+RUN addgroup -S shipitron && \
+    adduser -S -G shipitron shipitron && \
+    addgroup -g 1101 docker && \
+    addgroup shipitron docker
+
+RUN apk add --no-cache \
+    ca-certificates \
+    openssl-dev \
+    tini \
+    su-exec \
+    build-base \
+    git \
+    git-lfs \
+    openssh-client \
+    perl \
+    bash \
+    curl \
+    wget \
+    jq \
+    cmake
+
+ENV ECR_CREDENTIAL_HELPER_VERSION 0.5.0
+RUN cd /usr/local/bin && \
+      wget https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/${ECR_CREDENTIAL_HELPER_VERSION}/linux-amd64/docker-credential-ecr-login && \
+      chmod +x docker-credential-ecr-login
+
+ENV BUILDKIT_VERSION v0.8.3
+RUN cd /usr/local/bin && \
+      wget -nv https://github.com/moby/buildkit/releases/download/${BUILDKIT_VERSION}/buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz && \
+      tar --strip-components=1 -zxvf buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz bin/buildctl && \
+      chmod +x buildctl && \
+      rm -f buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz
+
+USER shipitron
+ENV BUILDX_VERSION v0.5.1
+RUN cd /home/shipitron && \
+      wget -nv https://github.com/docker/buildx/releases/download/${BUILDX_VERSION}/buildx-${BUILDX_VERSION}.linux-amd64 && \
+      mkdir -p ~/.docker/cli-plugins && \
+      mv buildx-${BUILDX_VERSION}.linux-amd64 ~/.docker/cli-plugins/docker-buildx && \
+      chmod a+x ~/.docker/cli-plugins/docker-buildx
+
+USER root
+ENV USE_BUNDLE_EXEC true
+ENV BUNDLE_GEMFILE /shipitron/Gemfile
+
+ENV BUNDLER_VERSION 2.2.21
+RUN gem install bundler -v ${BUNDLER_VERSION} -i /usr/local/lib/ruby/gems/$(ls /usr/local/lib/ruby/gems) --force
+
+WORKDIR /shipitron
+COPY Gemfile shipitron.gemspec /shipitron/
+COPY lib/shipitron/version.rb /shipitron/lib/shipitron/
+COPY exe/shipitron /shipitron/exe/shipitron
+COPY .git/ /shipitron/
+
+RUN bundle install
+
+COPY . /shipitron/
+RUN mkdir -p /home/shipitron/.ssh && \
+    chown shipitron:shipitron /home/shipitron/.ssh && \
+    chmod 700 /home/shipitron/.ssh
+
+WORKDIR /app
+
+COPY scripts/release-entrypoint.sh /docker-entrypoint.sh
+
+ENTRYPOINT ["/sbin/tini", "-g", "--", "/docker-entrypoint.sh"]
+CMD ["help"]

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 gem 'irb'
+gem 'rspec-buildkite', github: 'outstand/rspec-buildkite', branch: 'error-output'

data/README.md

@@ -68,23 +68,25 @@ If a containerized tool requires access to AWS resources, be sure to pass the `A
 
 ## Development
 
-- `./build_dev.sh`
-- `dev run --rm shipitron_specs` to run specs
+- `desk go`
+- `dev build --pull shipitron`
+- `rspec specs` to run specs
 - Set the application path in the volumes section in `docker-compose.yml`.
-- `dev run --rm shipitron deploy <app>` to run client side
-- `dev run --rm shipitron deploy <app> --simulate` to get the arguments for `server_deploy` below
-- `dev run --rm -v /bin/docker:/bin/docker -v /var/run/docker.sock:/var/run/docker.sock shipitron 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)
+- `shipitron deploy <app>` to run client side
+- `shipitron deploy <app> --simulate-store-deploy` to save the deploy options to S3 and generate deploy id
+- `dev run --rm -v /bin/docker:/bin/docker -v /var/run/docker.sock:/var/run/docker.sock shipitron server_deploy --deploy-id <deploy_id>` to run server side
 
 Running a dev version in production:
-- Update `Shipitron::Client::STARTED_BY`
-- `docker push outstand/shipitron:dev`
-- Update config to use `shipitron_task: shipitron-dev`
-- `dev run --rm shipitron deploy <app> --debug`
+- Ensure `SHIPITRON_STARTED_BY` env var is set for your `shipitron-staging` task def
+- `docker build --pull -t outstand/shipitron:staging -f Dockerfile.staging .`
+- `docker push outstand/shipitron:staging`
+- Update config to use `shipitron_task: shipitron-staging` and `outstand/shipitron:staging`
+- `shipitron deploy <app> --debug`
 
 To release a new version:
 - Update the version number in `version.rb` and `Dockerfile.release` and commit the result.
-- `./build_dev.sh`
-- `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`
+- `dev build --pull shipitron`
+- `release_gem`
 - `VERSION=<version>`
 - `docker build -t outstand/shipitron:$VERSION -f Dockerfile.release .`
 - `docker push outstand/shipitron:$VERSION`

data/docker-compose.yml

@@ -1,24 +1,54 @@
 version: '3.8'
 services:
   shipitron:
+    build: .
     image: outstand/shipitron:dev
+    environment:
+      FIXUID:
+      FIXGID:
     volumes:
-      - ~/dev/pages:/app # Set this to the application to be shipitron'd
+      - bundler-data:/usr/local/bundle
+      - ~/dev/app:/app # Set this to the application to be shipitron'd
       - shipitron-home:/home/shipitron
       - ~/.config/shipitron:/home/shipitron/.config/shipitron
       - .:/shipitron
-  shipitron_specs:
+
+  specs:
+    build: .
     image: outstand/shipitron:dev
-    command: rspec spec
+    command: rspec
     environment:
       FOG_LOCAL: 'true'
+      FIXUID:
+      FIXGID:
+      BUILDKITE:
+      BUILDKITE_BUILD_URL:
+      BUILDKITE_JOB_ID:
+      BUILDKITE_AGENT_ACCESS_TOKEN:
     working_dir: /shipitron
     volumes:
+      - bundler-data:/usr/local/bundle
       - fog:/fog
       - shipitron-home:/home/shipitron
-      - ~/.config/shipitron:/home/shipitron/.config/shipitron
       - .:/shipitron
 
+  release_gem:
+    image: outstand/shipitron:dev
+    command: rake release
+    working_dir: /shipitron
+    environment:
+      FIXUID:
+      FIXGID:
+    volumes:
+      - bundler-data:/usr/local/bundle
+      - shipitron-home:/home/shipitron
+      - .:/shipitron
+      - ~/.dotfiles/gitconfig:/root/.gitconfig
+      - ~/.dotfiles/gitconfig.user:/root/.gitconfig.user
+      - ~/.ssh/id_rsa:/root/.ssh/id_rsa
+      - ~/.gem:/root/.gem
+
 volumes:
   fog:
   shipitron-home:
+  bundler-data:

data/lib/shipitron.rb

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

data/lib/shipitron/cli.rb

@@ -12,18 +12,22 @@ module Shipitron
     desc 'deploy <app>', 'Deploys the app'
     option :config_file, default: 'shipitron/config.yml'
     option :secrets_file, default: '~/.config/shipitron/secrets.yml'
+    option :global_config_file, default: '~/.config/shipitron/config.yml'
     option :debug, type: :boolean, default: false
     option :simulate, type: :boolean, default: false
+    option :simulate_store_deploy, type: :boolean, default: false, desc: "Simulate and store deploy config in S3"
     def deploy(app)
       setup(
         config_file: options[:config_file],
-        secrets_file: options[:secrets_file]
+        secrets_file: options[:secrets_file],
+        global_config_file: options[:global_config_file]
       )
 
       require 'shipitron/client/deploy_application'
       result = Client::DeployApplication.call(
         application: app,
-        simulate: options[:simulate]
+        simulate: options[:simulate],
+        simulate_store_deploy: options[:simulate_store_deploy]
       )
 
       if result.failure?
@@ -59,49 +63,40 @@ module Shipitron
 
 
     desc 'server_deploy', 'Server-side component of deploy'
-    option :name, required: true
-    option :repository, required: true
-    option :repository_branch, default: 'master'
-    option :registry, default: nil
-    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 :skip_push, type: :boolean, default: false
-    option :region, required: true
-    option :clusters, type: :array, required: true
-    option :ecs_task_defs, type: :array, required: true
-    option :ecs_task_def_templates, type: :array, default: []
-    option :ecs_services, type: :array, default: []
-    option :ecs_service_templates, type: :array, default: []
-    option :build_script, default: nil
-    option :post_builds, type: :array
-    option :secrets_file, default: '~/.config/shipitron/secrets.yml'
-    option :debug, type: :boolean, default: false
+    option :deploy_id, required: true
     def server_deploy
-      setup(
-        secrets_file: options[:secrets_file]
-      )
+      setup
+
+      if !ENV.key?("SHIPITRON_DEPLOY_BUCKET") || !ENV.key?("SHIPITRON_DEPLOY_BUCKET_REGION")
+        raise "Missing shipitron deploy bucket env vars!"
+      end
+
+      require 'shipitron/server/fetch_deploy'
+      deploy_options = Server::FetchDeploy.call!(
+        deploy_bucket: ENV["SHIPITRON_DEPLOY_BUCKET"],
+        deploy_bucket_region: ENV["SHIPITRON_DEPLOY_BUCKET_REGION"],
+        deploy_id: options[:deploy_id]
+      ).deploy_options
 
       require 'shipitron/server/transform_cli_args'
       cli_args = Server::TransformCliArgs.call!(
-        application: options[:name],
-        repository_url: options[:repository],
-        repository_branch: options[:repository_branch],
-        registry: options[:registry],
-        s3_cache_bucket: options[:bucket],
-        build_cache_location: options[:build_cache_location],
-        image_name: options[:image_name],
-        named_tag: options[:named_tag],
-        skip_push: options[:skip_push],
-        region: options[:region],
-        clusters: options[:clusters],
-        ecs_task_defs: options[:ecs_task_defs],
-        ecs_task_def_templates: options[:ecs_task_def_templates],
-        ecs_services: options[:ecs_services],
-        ecs_service_templates: options[:ecs_service_templates],
-        build_script: options[:build_script],
-        post_builds: options[:post_builds]
+        application: deploy_options[:name],
+        repository_url: deploy_options[:repository],
+        repository_branch: deploy_options[:repository_branch],
+        registry: deploy_options[:registry],
+        s3_cache_bucket: deploy_options[:bucket],
+        build_cache_location: deploy_options[:build_cache_location],
+        image_name: deploy_options[:image_name],
+        named_tag: deploy_options[:named_tag],
+        skip_push: deploy_options[:skip_push],
+        region: deploy_options[:region],
+        clusters: deploy_options[:clusters],
+        ecs_task_defs: deploy_options[:ecs_task_defs],
+        ecs_task_def_templates: deploy_options[:ecs_task_def_templates],
+        ecs_services: deploy_options[:ecs_services],
+        ecs_service_templates: deploy_options[:ecs_service_templates],
+        build_script: deploy_options[:build_script],
+        post_builds: deploy_options[:post_builds]
       ).cli_args
 
       require 'shipitron/server/deploy_application'
@@ -149,7 +144,7 @@ module Shipitron
     end
 
     private
-    def setup(config_file:nil, secrets_file:nil)
+    def setup(config_file:nil, secrets_file:nil, global_config_file:nil)
       $stdout.sync = true
       if options[:debug] == false
         Logger.level = :info
@@ -157,6 +152,7 @@ module Shipitron
 
       Shipitron.config_file = config_file unless config_file.nil?
       Shipitron.secrets_file = secrets_file unless secrets_file.nil?
+      Shipitron.global_config_file = global_config_file unless global_config_file.nil?
     end
   end
 end

data/lib/shipitron/client.rb

@@ -2,8 +2,8 @@ require 'shipitron'
 
 module Shipitron
   module Client
-    STARTED_BY = 'shipitron'
-    # Use this for testing.
-    # STARTED_BY = 'shipitron-dev'
+    def self.started_by
+      ENV.fetch("SHIPITRON_STARTED_BY", "shipitron")
+    end
   end
 end

data/lib/shipitron/client/deploy_application.rb

@@ -14,6 +14,7 @@ module Shipitron
 
       required :application
       optional :simulate
+      optional :simulate_store_deploy
 
       organize [
         LoadApplicationConfig,

data/lib/shipitron/client/ensure_deploy_not_running.rb

@@ -22,7 +22,7 @@ module Shipitron
             begin
               response = ecs_client(region: cluster.region).list_tasks(
                 cluster: cluster.name,
-                started_by: Shipitron::Client::STARTED_BY,
+                started_by: Shipitron::Client.started_by,
                 max_results: 1,
                 desired_status: status
               )

data/lib/shipitron/client/generate_deploy.rb

@@ -0,0 +1,41 @@
+require 'shipitron'
+require 'shipitron/client'
+require 'shipitron/fetch_bucket'
+require 'aws-sdk-s3'
+require 'pastel'
+
+module Shipitron
+  module Client
+    class GenerateDeploy
+      include Metaractor
+
+      required :server_deploy_opts
+      required :deploy_id
+
+      def call
+        s3_key = "#{Shipitron::DEPLOY_BUCKET_PREFIX}#{context.deploy_id}"
+        pastel = Pastel.new
+        Logger.info "Uploading deploy config to #{pastel.blue("s3://#{deploy_bucket}/#{s3_key}")}"
+
+        client = Aws::S3::Client.new(region: deploy_bucket_region)
+
+        client.put_object(
+          bucket: deploy_bucket,
+          key: s3_key,
+          body: context.server_deploy_opts.to_json,
+          acl: "private"
+        )
+      end
+
+      private
+
+      def deploy_bucket
+        Shipitron.config.deploy_bucket
+      end
+
+      def deploy_bucket_region
+        Shipitron.config.deploy_bucket_region
+      end
+    end
+  end
+end

data/lib/shipitron/client/load_application_config.rb

@@ -1,6 +1,7 @@
 require 'shipitron'
 require 'shipitron/client'
 require 'shipitron/post_build'
+require 'aws-sdk-core'
 
 module Shipitron
   module Client
@@ -38,6 +39,19 @@ module Shipitron
         context.ecs_services = config.ecs_services
         context.ecs_task_def_dir = config.ecs_task_def_dir
         context.ecs_service_dir = config.ecs_service_dir
+
+        if Shipitron.config.aws_access_key_id? && Shipitron.config.aws_secret_access_key?
+          Aws.config.update(
+            credentials: Aws::Credentials.new(
+              Shipitron.config.aws_access_key_id,
+              Shipitron.config.aws_secret_access_key
+            )
+          )
+        end
+
+        if !Shipitron.config.deploy_bucket? || !Shipitron.config.deploy_bucket_region?
+          raise "Missing required deploy bucket configuration!"
+        end
       end
 
       private

data/lib/shipitron/client/run_ecs_tasks.rb

@@ -1,10 +1,12 @@
 require 'shipitron'
 require 'shipitron/client'
 require 'shipitron/ecs_client'
+require 'shipitron/client/generate_deploy'
 require 'shellwords'
 require 'base64'
 require 'tty-table'
 require 'pastel'
+require 'securerandom'
 
 module Shipitron
   module Client
@@ -21,23 +23,17 @@ module Shipitron
       required :image_name
       required :named_tag
       required :ecs_task_defs
-      optional :ecs_task_def_templates
-      optional :ecs_services
-      optional :ecs_service_templates
+      optional :ecs_task_def_templates, default: []
+      optional :ecs_services, default: []
+      optional :ecs_service_templates, default: []
       optional :build_script
       optional :skip_push
-      optional :post_builds
+      optional :post_builds, default: []
       optional :simulate
+      optional :simulate_store_deploy
       optional :repository_branch
       optional :registry
 
-      before do
-        context.post_builds ||= []
-        context.ecs_task_def_templates ||= {}
-        context.ecs_services ||= []
-        context.ecs_service_templates ||= {}
-      end
-
       def call
         Logger.info "Skipping ECS run_task calls due to --simulate" if simulate?
 
@@ -56,27 +52,31 @@ module Shipitron
           Logger.info line.chomp
         end
 
-        cluster = clusters.first
+        @cluster = clusters.first
 
         begin
           if simulate?
-            command_args(cluster)
+            server_deploy_opts
+            generate_deploy! if context.simulate_store_deploy == true
+
             return
           end
 
-          response = ecs_client(region: cluster.region).run_task(
-            cluster: cluster.name,
+          generate_deploy!
+
+          response = ecs_client(region: @cluster.region).run_task(
+            cluster: @cluster.name,
             task_definition: shipitron_task,
             overrides: {
               container_overrides: [
                 {
                   name: 'shipitron',
-                  command: command_args(cluster)
+                  command: command_args(deploy_id: deploy_id)
                 }
               ]
             },
             count: 1,
-            started_by: Shipitron::Client::STARTED_BY
+            started_by: Shipitron::Client.started_by
           )
 
           if !response.failures.empty?
@@ -106,81 +106,99 @@ module Shipitron
         context.shipitron_task
       end
 
-      def command_args(cluster)
+      def deploy_id
+        return @_deploy_id if defined?(@_deploy_id)
+
+        @_deploy_id = SecureRandom.uuid
+      end
+
+      def generate_deploy!
+        Shipitron::Client::GenerateDeploy.call!(
+          server_deploy_opts: server_deploy_opts,
+          deploy_id: deploy_id
+        )
+      end
+
+      def command_args(deploy_id:)
         [
           'server_deploy',
-          '--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,
-        ].tap do |ary|
-          ary << '--clusters'
-          ary.concat(context.clusters.map(&:name))
-
-          ary << '--ecs-task-defs'
-          ary.concat(context.ecs_task_defs)
-
-          unless context.ecs_services.empty?
-            ary << '--ecs-services'
-            ary.concat(context.ecs_services)
-          end
+          '--deploy-id', deploy_id
+        ]
+      end
 
-          if context.registry != nil
-            ary.concat ['--registry', context.registry]
-          end
+      def server_deploy_opts
+        return @_server_deploy_opts if defined?(@_server_deploy_opts)
+
+        @_server_deploy_opts =
+          {
+            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
+          }.tap do |opts|
+            opts[:clusters] =
+              context.clusters.map(&:name)
+
+            opts[:ecs_task_defs] =
+              context.ecs_task_defs
+
+            unless context.ecs_services.empty?
+              opts[:ecs_services] =
+                context.ecs_services
+            end
 
-          if context.build_script != nil
-            ary.concat ['--build-script', context.build_script]
-          end
+            if context.registry != nil
+              opts[:registry] = context.registry
+            end
 
-          if context.skip_push != nil
-            ary.concat ['--skip-push', context.skip_push.to_s]
-          end
+            if context.build_script != nil
+              opts[:build_script] = context.build_script
+            end
 
-          if !context.post_builds.empty?
-            ary << '--post-builds'
-            ary.concat(context.post_builds.map(&:to_s))
-          end
+            if context.skip_push != nil
+              opts[:skip_push] = context.skip_push.to_s
+            end
 
-          if !context.ecs_task_def_templates.empty?
-            ary << '--ecs-task-def-templates'
-            ary.concat(
-              context.ecs_task_def_templates.map do |name, data|
-                if context.ecs_task_defs.include?(name)
-                  Base64.urlsafe_encode64(data)
-                end
-              end.compact
-            )
-          end
+            if !context.post_builds.empty?
+              opts[:post_builds] =
+                context.post_builds.map(&:to_s)
+            end
 
-          if !context.ecs_service_templates.empty?
-            ary << '--ecs-service-templates'
-            ary.concat(
-              context.ecs_service_templates.map do |name, data|
-                if context.ecs_services.include?(name)
-                  Base64.urlsafe_encode64(data)
-                end
-              end.compact
-            )
-          end
+            if !context.ecs_task_def_templates.empty?
+              opts[:ecs_task_def_templates] =
+                context.ecs_task_def_templates.map do |name, data|
+                  if context.ecs_task_defs.include?(name)
+                    Base64.urlsafe_encode64(data)
+                  end
+                end.compact
+            end
 
-          unless context.repository_branch.nil?
-            ary.concat ['--repository-branch', context.repository_branch]
-          end
+            if !context.ecs_service_templates.empty?
+              opts[:ecs_service_templates] =
+                context.ecs_service_templates.map do |name, data|
+                  if context.ecs_services.include?(name)
+                    Base64.urlsafe_encode64(data)
+                  end
+                end.compact
+            end
 
-          if simulate?
-            Logger.info "server_deploy command: #{ary.shelljoin}"
-          else
-            Logger.debug "server_deploy command: #{ary.shelljoin}"
+            unless context.repository_branch.nil?
+              opts[:repository_branch] = context.repository_branch
+            end
+
+            if simulate?
+              Logger.info "server_deploy opts:\n#{JSON.pretty_generate(opts)}"
+            else
+              Logger.debug "server_deploy opts:\n#{JSON.pretty_generate(opts)}"
+            end
           end
-        end
       end
 
       def simulate?
-        context.simulate == true
+        context.simulate == true || context.simulate_store_deploy == true
       end
     end
   end

data/lib/shipitron/server/fetch_deploy.rb

@@ -0,0 +1,50 @@
+require 'shipitron'
+require 'aws-sdk-s3'
+require 'json'
+
+module Shipitron
+  module Server
+    class FetchDeploy
+      include Metaractor
+
+      required :deploy_bucket
+      required :deploy_bucket_region
+      required :deploy_id
+
+      def call
+        s3_key = "#{Shipitron::DEPLOY_BUCKET_PREFIX}#{context.deploy_id}"
+        Logger.info "Fetching deploy config from s3://#{deploy_bucket}/#{s3_key}"
+
+        response = client.get_object(
+          bucket: deploy_bucket,
+          key: s3_key
+        )
+
+        context.deploy_options =
+          JSON.parse(response.body.read)
+          .transform_keys {|k| k.to_sym }
+      end
+
+      private
+
+      def client
+        Aws::S3::Client.new(
+          region: deploy_bucket_region,
+          **client_opts
+        )
+      end
+
+      def client_opts
+        {}
+      end
+
+      def deploy_bucket
+        context.deploy_bucket
+      end
+
+      def deploy_bucket_region
+        context.deploy_bucket_region
+      end
+    end
+  end
+end

data/lib/shipitron/server/git/clone_local_copy.rb

@@ -13,7 +13,7 @@ module Shipitron
         optional :repository_branch
 
         before do
-          context.repository_branch ||= 'master'
+          context.repository_branch ||= 'main'
         end
 
         def call

data/lib/shipitron/server/git/update_cache.rb

@@ -13,7 +13,7 @@ module Shipitron
         optional :repository_branch
 
         before do
-          context.repository_branch ||= 'master'
+          context.repository_branch ||= 'main'
         end
 
         def call

data/lib/shipitron/version.rb

@@ -1,3 +1,3 @@
 module Shipitron
-  VERSION = '1.3.2'
+  VERSION = '1.4.0'
 end

data/scripts/docker-entrypoint.sh

@@ -1,14 +1,26 @@
 #!/bin/sh
-set -e
+
+set -euo pipefail
+
+su-exec ${FIXUID:?Missing FIXUID var}:${FIXGID:?Missing FIXGID var} fixuid
 
 chown_dir() {
   dir=$1
-  if [ "$(stat -c %u ${dir})" = '0' ]; then
-    chown -R shipitron:shipitron $dir
+  if [[ -d ${dir} ]] && [[ "$(stat -c %u:%g ${dir})" != "${FIXUID}:${FIXGID}" ]]; then
+    echo chown $dir
+    chown shipitron:shipitron $dir
   fi
 }
 
 chown_dir /home/shipitron
+chown_dir /usr/local/bundle
+
+if [ "$1" = 'bundle' ]; then
+  set -- su-exec shipitron "$@"
+  exec "$@"
+elif [ "$1" = 'rake' ] && [ "$2" = 'release' ]; then
+  exec "$@"
+fi
 
 if [ -n "$USE_BUNDLE_EXEC" ]; then
   BINARY="bundle exec shipitron"
@@ -16,10 +28,23 @@ else
   BINARY=shipitron
 fi
 
-if ${BINARY} help "$1" 2>&1 | grep -q "shipitron $1"; then
+if [ "$(ls -A /usr/local/bundle/bin)" = '' ]; then
+  echo 'command not in path and bundler not initialized'
+  echo 'running bundle install'
+  su-exec shipitron bundle install
+else
+  su-exec shipitron bash -c 'bundle check || bundle install'
+fi
+
+# ${BINARY} help "$1"
+
+if ls /usr/local/bundle/bin | grep -q "\b$1\b"; then
+  set -- su-exec shipitron bundle exec "$@"
+
+elif ${BINARY} help "$1" 2>&1 | grep -q "shipitron $1"; then
   set -- su-exec shipitron ${BINARY} "$@"
 
-  if [ -n "$FOG_LOCAL" ]; then
+  if [ -n "${FOG_LOCAL:-}" ]; then
     chown -R shipitron:shipitron /fog
   fi
 fi

data/scripts/release-entrypoint.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -euo pipefail
+
+if [ -n "$USE_BUNDLE_EXEC" ]; then
+  BINARY="bundle exec shipitron"
+else
+  BINARY=shipitron
+fi
+
+# ${BINARY} help "$1"
+
+if ls /usr/local/bundle/bin | grep -q "\b$1\b"; then
+  set -- su-exec shipitron bundle exec "$@"
+
+elif ${BINARY} help "$1" 2>&1 | grep -q "shipitron $1"; then
+  set -- su-exec shipitron ${BINARY} "$@"
+fi
+
+exec "$@"

data/shipitron.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'thor', '~> 1.0'
   spec.add_runtime_dependency 'aws-sdk-ecs', '~> 1.8'
+  spec.add_runtime_dependency 'aws-sdk-s3', '~> 1.96'
   spec.add_runtime_dependency 'hashie', '~> 4.1'
-  spec.add_runtime_dependency 'metaractor', '~> 3.0'
+  spec.add_runtime_dependency 'metaractor', '~> 3.1'
   spec.add_runtime_dependency 'diplomat', '~> 2.0'
   spec.add_runtime_dependency 'fog-aws', '~> 3.6'
   spec.add_runtime_dependency 'mime-types', '~> 3.1'
@@ -29,13 +30,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'tty-command', '~> 0.7'
   spec.add_runtime_dependency 'tty-table', '~> 0.9'
   spec.add_runtime_dependency 'pastel', '~> 0.7'
-  spec.add_runtime_dependency 'excon', '~> 0.76'
+  spec.add_runtime_dependency 'excon', '~> 0.82'
   spec.add_runtime_dependency 'rugged', '~> 1.0'
 
   spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "pry-byebug", "~> 3.5"
-  spec.add_development_dependency "rspec", "~> 3.7"
+  spec.add_development_dependency "pry-byebug", "~> 3.9"
+  spec.add_development_dependency "rspec", "~> 3.10"
   spec.add_development_dependency "fivemat", "~> 1.3"
   spec.add_development_dependency "fog-local", "~> 0.4"
 end

data/test.yml

@@ -0,0 +1,5 @@
+version: '3.8'
+services:
+  specs:
+    volumes:
+      - "/var/lib/buildkite-agent/buildkite-agent:/usr/local/bin/buildkite-agent"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipitron
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.96'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.96'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: '0.82'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: '0.82'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -240,28 +254,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
@@ -298,17 +312,19 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".buildkite/pipeline.yml"
 - ".dockerignore"
 - ".gitattributes"
 - ".gitignore"
 - ".rspec"
+- Deskfile
 - Dockerfile
 - Dockerfile.release
+- Dockerfile.staging
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- build_dev.sh
 - docker-compose.yml
 - exe/shipitron
 - lib/shipitron.rb
@@ -320,6 +336,7 @@ files:
 - lib/shipitron/client/ensure_deploy_not_running.rb
 - lib/shipitron/client/fetch_clusters.rb
 - lib/shipitron/client/force_deploy.rb
+- lib/shipitron/client/generate_deploy.rb
 - lib/shipitron/client/load_application_config.rb
 - lib/shipitron/client/load_templates.rb
 - lib/shipitron/client/register_ecs_task_definitions.rb
@@ -346,6 +363,7 @@ files:
 - lib/shipitron/server/ecs_task_defs/map_parsed_templates.rb
 - lib/shipitron/server/ecs_task_defs/update_from_params.rb
 - lib/shipitron/server/ecs_task_defs/update_in_place.rb
+- lib/shipitron/server/fetch_deploy.rb
 - lib/shipitron/server/git/clone_local_copy.rb
 - lib/shipitron/server/git/configure.rb
 - lib/shipitron/server/git/download_cache.rb
@@ -361,7 +379,9 @@ files:
 - lib/shipitron/smash.rb
 - lib/shipitron/version.rb
 - scripts/docker-entrypoint.sh
+- scripts/release-entrypoint.sh
 - shipitron.gemspec
+- test.yml
 homepage: https://github.com/outstand/shipitron
 licenses: []
 metadata: {}
@@ -380,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A deployment tool for use with Docker and ECS.

data/build_dev.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-set -e -x
-
-build_image=outstand/shipitron:dev
-dockerfile=Dockerfile
-bundler_data_dir=cache
-
-tar_container=''
-
-function cleanup {
-  if [ -n "$tar_container" ]; then
-    docker rm -fv ${tar_container}
-  fi
-
-  rm -f ${bundler_data_dir}/cidfile
-}
-
-trap cleanup EXIT
-
-build_args=''
-mkdir -p ${bundler_data_dir}
-
-docker build --pull -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 .
-tar_container=$(cat ${bundler_data_dir}/cidfile)
-docker cp ${tar_container}:/tmp/bundler-data.tar.gz ${bundler_data_dir}/bundler-data.tar.gz