stack_car 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc7eacf2b940c9efa131b58a489ef55808504675
-  data.tar.gz: 70297ae4fed6d8e0ab3a623ebbbadbe0aa05819d
+  metadata.gz: c72e980bbffa17149e6be7837ad3ad9e5976067c
+  data.tar.gz: e145e199cc0618a45a819a788be3f48b06e88874
 SHA512:
-  metadata.gz: 48bdbc3d7ba5c002c5c9d602d2557b5785bc738426c6171420a30c421e54ccadbbc2f65e1158ac965590b56c6c0410c6fb71353e6f28d139c58bf466ebc1226b
-  data.tar.gz: b10ce8a52d5966d0bb28bdadf0c8d74115671b9bbaa748230cc218ab0beb1ce2d0139ac5cc4b154f28cafeb7b02205fc6dcc3aa4f4a285bb88e68c79ff50a4a4
+  metadata.gz: dd315865d0ad824d4cf554fddb8840d562ff14f21bea436c7678db68b532d9bb5c0da77b9b83e4c2b3cc289c5edf702f6bbe89d144f53f89d4b1a1eb4cc265bb
+  data.tar.gz: 404f6a4b47a30caa5abe10f67cd5835eab88a3e567a860906a139d343105e9df0ab172d9469e798d85b60bf6d937ade496ed17e410692d246d21205377fa666c

data/lib/stack_car/cli.rb

@@ -11,17 +11,31 @@ module StackCar
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
+    method_option :build, default: true, type: :boolean, aliases: '-b'
     desc "up", "starts docker-compose with rebuild and orphan removal, defaults to web"
     def up
-      run("docker-compose up --build --remove-orphans #{options[:service]}")
+      args = ['--remove-orphans']
+      args << '--build' if options[:build]
+      run("rm -rf tmp/pids/server.pid")
+      run("docker-compose up #{args.join(' ')} #{options[:service]}")
     end
 
     method_option :service, default: '', type: :string, aliases: '-s'
     desc "stop", "starts docker-compose with rebuild and orphan removal, defaults to all"
     def stop
       run("docker-compose stop #{options[:service]}")
+      run("rm -rf tmp/pids/server.pid")
     end
 
+    method_option :service, default: 'web', type: :string, aliases: '-s'
+    desc "build", "build the services, defaults to web"
+    def build
+      @project_name = File.basename(File.expand_path('.'))
+      run("docker-compose build #{options[:service]}")
+      run("docker cp #{@project_name}_#{options[:service]}_1:/bundle .")
+    end
+
+
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc "walk ARGS", "wraps docker-compose run web unless --service is used to specify"
     def walk(*args)
@@ -51,7 +65,7 @@ module StackCar
 
     desc "release ENVIRONTMENT", "tag and push and image to the registry"
     def release(environment)
-      registry = "ENV['REGISTRY_HOST']ENV['REGISTRY_URI']"
+      registry = "#{ENV['REGISTRY_HOST']}#{ENV['REGISTRY_URI']}"
       run("docker login #{ENV['REGISTRY_HOST']}")
       run("docker tag #{registry} #{registry}:#{environment}-#{Time.now.strftime("%Y%m%d%I%M%S")}")
       run("docker push #{registry}:#{environment}-#{Time.now.strftime("%Y%m%d%I%M%S")}")
@@ -103,7 +117,7 @@ module StackCar
       ['.dockerignore', 'Dockerfile', 'docker-compose.yml', 'docker-compose-prod.yml', '.gitlab-ci.yml', '.env'].each do |template_file|
         template("#{template_file}.erb", template_file)
       end
-
+      empty_directory('bundle')
       if options[:deploy] || options[:rancher]
         directory('ops')
         ['hosts'].each do |template_file|

data/lib/stack_car/version.rb

@@ -1,3 +1,3 @@
 module StackCar
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/templates/Dockerfile.erb

@@ -17,11 +17,12 @@ ENV APP_HOME /app
 RUN mkdir $APP_HOME
 WORKDIR $APP_HOME
 
+COPY ./bundle /bundle
 ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
   BUNDLE_JOBS=2 \
   BUNDLE_PATH=/bundle
 
 ADD Gemfile* $APP_HOME/
-RUN bundle install
+RUN bundle check || bundle install
 
 COPY . $APP_HOME

data/templates/docker-compose-prod.yml.erb

@@ -2,7 +2,7 @@ version: '2'
 services:
   web:
     image: <%= @project_name %>:latest
-    command: bundle exec rake assets:precompile && bundle exec rails s -p 3000 -b '0.0.0.0'
+    command: bash -c "bundle exec rake assets:precompile db:migrate && bundle exec rails s -p 3000 -b '0.0.0.0'"
     environment:
       - RAILS_ENV=production
       - RACK_ENV=production

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack_car
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler