stack_car 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93b58e9c3c162600cc498d4c2242c5da431c090d
-  data.tar.gz: d4608eac83ba102a95180a2045a86e8a061397b7
+  metadata.gz: 2331786a667cdd1c925669949212b88fc6b9c9a6
+  data.tar.gz: db83a6aa549e9f2dce0b61e9c2cbd0ffc3cc5ee7
 SHA512:
-  metadata.gz: a9897dcb06eb7a510182c81157f58c478dde1f4fd029c1721fa64a5f5dc4dbb31948b4cf37eb10c30dc816fc2d0fd4ed9c9cb1e249be371da91bfad44b8b1c3f
-  data.tar.gz: 23b934044181ea9b232226b41d15149b9ea75726d73d91245373a744fa061cf3be39ecfc17d49629e2096a69477c487f75321b477d6f1e1e32d576149408c5bd
+  metadata.gz: c36afa299abfc85fdfaa533fbff3c2a787619d76e369c91b5b10284a94349fc38e8bb8c710759eedba0ffbf3fe4e93c93e3c4ed4d88c9b1b6f2f876676c4245f
+  data.tar.gz: 52f60ba42b4939e897e4382de82bb2dd8b083f9aa749ae1e90089ab8c836f08d8b6c8af52fe8ac971a5c87683059f7921349e6e03223eed7e144b2a8fe03ccc0

data/lib/stack_car/cli.rb

@@ -93,23 +93,37 @@ module StackCar
     def release(environment)
       timestamp = Time.now.strftime("%Y%m%d%I%M%S")
       registry = "#{ENV['REGISTRY_HOST']}#{ENV['REGISTRY_URI']}"
-      run("docker login #{ENV['REGISTRY_HOST']}")
-      run("docker tag #{registry} #{registry}:#{environment}-#{timestamp}")
+      tag = ENV["TAG"] || 'latest'
+      unless File.exists?("#{ENV['HOME']}/.docker/config.json") && File.readlines("#{ENV['HOME']}/.docker/config.json").grep(/#{ENV['REGISTRY_HOST']}/).size > 0
+        run("docker login #{ENV['REGISTRY_HOST']}")
+      end
+      run("docker tag #{registry}:#{tag} #{registry}:#{environment}-#{timestamp}")
       run("docker push #{registry}:#{environment}-#{timestamp}")
-      run("docker tag #{registry} #{registry}:#{environment}-latest")
+      run("docker tag #{registry}:#{tag} #{registry}:#{environment}-latest")
       run("docker push #{registry}:#{environment}-latest")
-      run("docker tag #{registry} #{registry}:latest")
+      run("docker tag #{registry}:#{tag} #{registry}:latest")
       run("docker push #{registry}:latest")
     end
 
     desc "provision ENVIRONMENT", "configure the servers for docker and then deploy an image"
     def provision(environment)
-      run("cd ops && ansible-playbook -i hosts -l #{environment}:localhost provision.yml")
+      run("ansible-playbook -i ops/hosts -l #{environment}:localhost ops/provision.yml")
+    end
+
+    method_option :service, default: 'web', type: :string, aliases: '-s'
+    desc "ssh ENVIRONMENT", "log in to a running instance - requires PRODUCTION_SSH to be set"
+    def ssh(environment)
+      target = ENV["#{environment.upcase}_SSH"]
+      if target
+        run(target)
+      else
+        say "Please set #{environment.upcase}_SSH"
+      end
     end
 
     desc "deploy ENVIRONMENT", "deploy an image from the registry"
     def deploy(environment)
-      run("cd ops && ansible-playbook -i hosts -l #{environment}:localhost deploy.yml")
+      run("ansible-playbook -i ops/hosts -l #{environment}:localhost ops/deploy.yml")
     end
 
     method_option :elasticsearch, default: false, type: :boolean, aliases: '-e'

data/lib/stack_car/version.rb

@@ -1,3 +1,3 @@
 module StackCar
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

data/templates/.env.erb

@@ -23,5 +23,5 @@ SITE_URI=https://TODO.com
 DEPLOY_HOOK=TODO
 <% end -%>
 TAG=dev
-VIRUAL_PORT=80
+VIRTUAL_PORT=80
 PASSENGER_APP_ENV=development

data/templates/Dockerfile.erb

@@ -31,6 +31,7 @@ RUN bundle check || bundle install
 RUN touch /var/log/worker.log && chmod 666 /var/log/worker.log
 RUN mkdir /etc/service/worker
 ADD ops/worker.sh /etc/service/worker/run
+RUN chmod +x /etc/service/worker/run
 <% end %>
 
 COPY . $APP_HOME
@@ -38,6 +39,7 @@ RUN chown -R app $APP_HOME
 
 # Asset complie and migrate if prod, otherwise just start nginx
 ADD ops/nginx.sh /etc/service/nginx/run
+RUN chmod +x /etc/service/nginx/run
 RUN rm -f /etc/service/nginx/down
 
 CMD ["/sbin/my_init"]

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

@@ -62,7 +62,7 @@ services:
       - "8080"
 <% end -%>
   web:
-    image: "${REGISTRY_HOST}/${REGISTRY_URI}:${TAG:-master}"
+    image: "${REGISTRY_HOST}${REGISTRY_URI}:${TAG:-master}"
     env_file:
       - .env-example
     labels:

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

@@ -1,7 +1,7 @@
 version: '2.1'
 services:
   web:
-    image: "${REGISTRY_HOST}/${REGISTRY_URI}:${TAG:-master}"
+    image: "${REGISTRY_HOST}${REGISTRY_URI}:${TAG:-master}"
     environment:
       - RAILS_ENV=production
       - RACK_ENV=production

data/templates/docker-compose.yml.erb

@@ -77,7 +77,7 @@ services:
 <% end -%>
   web:
     build: .
-    image: "${REGISTRY_HOST}/${REGISTRY_URI}:${TAG:-master}"
+    image: "${REGISTRY_HOST}${REGISTRY_URI}:${TAG:-master}"
     volumes:
       - .:/home/app/webapp
     env_file:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack_car
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler