stack_car 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab548993e40ac69f202ebd527b9267a894384564
-  data.tar.gz: e83132c55cb05ecbfa64030fc4ef1c285a30e4ea
+  metadata.gz: 599420272bb040246155a839e357acd506c30da0
+  data.tar.gz: e3782f587282d7023088dca86532d631ae6e56c4
 SHA512:
-  metadata.gz: 83328c92add8711e0d8a22519de375069ad8f3b11e5741eca0daaee75305564bdda5038f74183cb6da4b2c0da830791dfb2a2ea613761720b80fb373be6e99dc
-  data.tar.gz: 070fc4e7bf7d2d00a3b0607ac23d20ae77f33c3fdf398b605383c362dd527167634c64c3b2002738d6a4320b635cd8bbf9815536f8fd9c969fc882283789dacd
+  metadata.gz: bc0c57d5111533f813b3534fdc58b1c736594d3190b5716a9d8cfea210342523152e31c51304ebaf59161d8cea900d8ff9ac76752820ad74a7b0d24c76835c91
+  data.tar.gz: 417b8a1e0865568b470f048debdb80f9bbb34abe4c45bf93df8e087b4ae7a027ca31152931abb1b427989547f431d2e6239a9b9db253492110485dd8ab5b54e5

data/README.md

@@ -43,7 +43,10 @@ Bug reports and pull requests are welcome on Gitlab at https://gitlab.com/notch8
 
 ## TODO
 
-- Implement build
+- move .env files to dot style
+- make .env secret by default
+- update .gitlab to latest (see learn and ansur)
+
 - Fill out readme
 - Implement deploy
 - Implement deploy templates

data/exe/sc

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require "stack_car"
+
+StackCar::HammerOfTheGods.start(ARGV)

data/lib/stack_car/cli.rb

@@ -138,6 +138,9 @@ module StackCar
         template("#{template_file}.erb", template_file)
      end
      template("database.yml.erb", "config/database.yml")
+     template(".env.erb", ".env-example")
+     template(".env.erb", ".env-prod")
+
      if File.exists?('README.md')
        prepend_to_file "README.md" do
          File.read("#{self.class.source_root}/README.md")
@@ -158,7 +161,7 @@ module StackCar
       end
 
       # Do this after we figure out whether to use an empty ops directory or a full one
-      ['env.conf', 'webapp.conf'].each do |template_file|
+      ['env.conf', 'webapp.conf', 'worker.sh', 'nginx.sh'].each do |template_file|
         template("#{template_file}.erb", "ops/#{template_file}")
       end
     end
@@ -166,7 +169,7 @@ module StackCar
     protected
     def compose_depends(*excludes)
       @compose_depends = []
-      services = [:postgres, :mysql, :elasticsearch, :solr, :redis, :mongodb, :memcached, :delayed_job] - excludes
+      services = [:postgres, :mysql, :elasticsearch, :solr, :redis, :mongodb, :memcached] - excludes
       services.each do |service|
         if options[service]
           @compose_depends << "      - #{service}"

data/lib/stack_car/version.rb

@@ -1,3 +1,3 @@
 module StackCar
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/stack_car.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard"
   spec.add_development_dependency "yard-thor"
   spec.add_development_dependency "pry"
-  spec.add_dependency "dotenv", "~> 2.0"
-  spec.add_dependency "thor", "~> 0.19"
+  spec.add_runtime_dependency "dotenv", "~> 2.2"
+  spec.add_runtime_dependency "thor", "~> 0.19"
 end

data/templates/.env.erb

@@ -13,6 +13,9 @@ MYSQL_ROOT_PASSWORD=DatabaseFTW
 MYSQL_HOST=mysql
 TEST_DB=<%= @project_name %>_test
 <% end -%>
+<% if options[:elasticsearch] -%>
+ES_URL=http://elasticsearch:9200
+<% end -%>
 <% if options[:deploy] || options[:rancher] -%>
 REGISTRY_HOST=registry.gitlab.com
 REGISTRY_URI=/TODO/<%= @project_name %>
@@ -21,3 +24,4 @@ DEPLOY_HOOK=TODO
 <% end -%>
 TAG=dev
 VIRUAL_PORT=80
+PASSENGER_APP_ENV=development

data/templates/.gitlab-ci.yml.erb

@@ -28,21 +28,28 @@ variables:
 <% if options[:postgres] -%>
   POSTGRES_DB: <%= @project_name %>
   POSTGRES_USER: postgres
-  POSTGRES_PASSWORD: DatabaseFTW
+  POSTGRES_PASSWORD: password
+  POSTGRES_HOST: postgres
 <% end -%>
-<% if options[:MYSQL] -%>
+<% if options[:mysql] -%>
   MYSQL_DATABASE: <%= @project_name %>
-  MYSQL_ROOT_PASSWORD: DatabaseFTW
+  MYSQL_ROOT_PASSWORD: password
+  MYSQL_USER: <%= @project_name %>_test
+  MYSQL_PASSWORD: password
+  MYSQL_HOST: mysql
 <% end -%>
   TEST_DB: <%= @project_name %>
   DOCKER_DRIVER: overlay
+  REGISTRY_HOST: registry.gitlab.com
+  REGISTRY_URI: TODO/<%= @project_name %>
+  SITE_URI_BASE: TODO
 
 build:
   stage: build
   script:
     - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_SLUG"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG"
   variables:
     GIT_STRATEGY: fetch
   tags:
@@ -50,7 +57,7 @@ build:
 
 test:
   stage: test
-  image: $CI_REGISTRY_IMAGE:$CI_BUILD_REF_SLUG
+  image: $CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
   script:
     - cd /app && bundle exec rake db:create db:schema:load spec
   tags:
@@ -63,19 +70,21 @@ review:
   image: docker:latest
   type: deploy
   environment:
-    name: $CI_BUILD_REF_SLUG
-    url: http://web.$CI_BUILD_REF_SLUG.staging.$SITE_URI
+    name: $CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
+    url: http://web.$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG.staging.$SITE_URI_BASE
     on_stop: stop_review
   only:
     - branches
   except:
     - master
   script:
+<% if options[:rancher] -%>
     - wget https://github.com/rancher/cli/releases/download/v0.4.1/rancher-linux-amd64-v0.4.1.tar.gz
     - tar zxfv rancher-linux-amd64-v0.4.1.tar.gz
     - export RANCHER_ENVIRONMENT=staging
-    - export TAG=$CI_BUILD_REF_SLUG
+    - export TAG=$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
     - ./rancher-v0.4.1/rancher up -p -d -u -c -s $TAG -f docker-compose-ci.yml
+<% end %>
   variables:
     GIT_STRATEGY: fetch
   tags:
@@ -89,13 +98,13 @@ stop_review:
     - wget https://github.com/rancher/cli/releases/download/v0.4.1/rancher-linux-amd64-v0.4.1.tar.gz
     - tar zxfv rancher-linux-amd64-v0.4.1.tar.gz
     - export RANCHER_ENVIRONMENT=staging
-    - ./rancher-v0.4.1/rancher rm $CI_BUILD_REF_SLUG
+    - ./rancher-v0.4.1/rancher rm $CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
 <% end %>
   variables:
     GIT_STRATEGY: none
   when: manual
   environment:
-    name: $CI_BUILD_REF_SLUG
+    name: $CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
     action: stop
 
 staging:

data/templates/Dockerfile.erb

@@ -36,6 +36,8 @@ ADD ops/worker.sh /etc/service/worker/run
 COPY . $APP_HOME
 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 rm -f /etc/service/nginx/down
 
 CMD ["/sbin/my_init"]

data/templates/README.md

@@ -2,7 +2,7 @@
 
 1) Install Docker.app 
 
-2) Get .env file from team member or copy it from .env.example and fill it out
+2) Get .env file from team member or copy it from .env-example and fill it out
 
 3) gem install stack_car
 
@@ -21,3 +21,4 @@ sc release {staging | production} # creates and pushes the correct tags
 sc deploy {staging | production} # deployes those tags to the server
 ```
 
+Releaese and Deployment are handled by the gitlab ci by default. See ops/deploy-app to deploy from locally, but note all Rancher install pull the currently tagged registry image

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

@@ -4,21 +4,17 @@ services:
   postgres:
     image: postgres
     env_file:
-      - .env
+      - .env-example
     ports:
       - "5432"
-    volumes:
-      - 'postgres:/var/lib/postgresql/data'
 <% end -%>
 <% if options[:mysql] -%>
   mysql:
     image: mysql
     env_file:
-      - .env
+      - .env-example
     ports:
       - '3306'
-    volumes:
-      - 'mysql:/var/lib/mysql'
 <% end -%>
 <% if options[:elasticsearch] -%>
   elasticsearch:
@@ -26,16 +22,12 @@ services:
     ports:
       - "9200"
       - "9300"
-    volumes:
-      - 'elasticsearch:/usr/share/elasticsearch/data'
 <% end -%>
 <% if options[:solr] %>
   solr:
     image: solr:latest
     ports:
       - "8983"
-    volumes:
-      - 'solr:/opt/solr/server/solr/mycores'
     entrypoint:
       - docker-entrypoint.sh
       - solr-precreate
@@ -48,14 +40,10 @@ services:
     command: redis-server
     ports:
       - '6379'
-    volumes:
-      - 'redis:/var/lib/redis/data'
 <% end -%>
 <% if options[:mongodb] -%>
   mongodb:
     image: mongo:2.6.12
-    volumes:
-      - 'mongodb:/data/db'
     ports:
       - "27017"
 <% end -%>
@@ -73,55 +61,16 @@ services:
     ports:
       - "8080"
 <% end -%>
-  main:
+  web:
     image: "${REGISTRY_HOST}/${REGISTRY_URI}:${TAG:-master}"
-    volumes:
-      - .:/app
     env_file:
-      - .env
-    # Keep the stdin open, so we can attach to our app container's process
-    # and do things such as byebug, etc:
-    stdin_open: true
-    # Enable sending signals (CTRL+C, CTRL+P + CTRL+Q) into the container:
-    tty: true
-<% if options[:delayed_job] -%>
-  delayed_job:
-    extends:
-      service: main
-    command: ./bin/delayed_job run
-    depends_on:
-<%= compose_depends(:delayed_job) %>
-<% end -%>
-  web:
-    extends:
-      service: main
-    command: bundle exec rails s -p 3000 -b '0.0.0.0'
+      - .env-example
     labels:
       rap.host: ${SITE_URI}
       rap.le_host: ${SITE_URI}
       rap.le_test: true
+      io.rancher.container.pull_image: always
     ports:
-      - "3000"
+      - "80"
     depends_on:
 <%= compose_depends %>
-
-volumes:
-<% if options[:postgres] -%>
-  postgres:
-<% end -%>
-<% if options[:mysql] -%>
-  mysql:
-<% end -%>
-<% if options[:elasticsearch] -%>
-  elasticsearch:
-<% end -%>
-<% if options[:solr] -%>
-  solr:
-<% end -%>
-<% if options[:redis] -%>
-  redis:
-<% end -%>
-<% if options[:mongodb] -%>
-  mongodb:
-<% end -%>
-

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

@@ -2,19 +2,20 @@ version: '2.1'
 services:
   web:
     image: "${REGISTRY_HOST}/${REGISTRY_URI}:${TAG:-master}"
-    command: bash -c "bundle exec rake assets:precompile db:migrate && bundle exec passenger start -p 3000 -b '0.0.0.0'""
     environment:
       - RAILS_ENV=production
       - RACK_ENV=production
+      - PASSENGER_APP_ENV=production
     restart: unless-stopped
     ports:
-      - "3000"
+      - "80"
     labels:
       rap.host: ${SITE_URI}
       rap.le_host: ${SITE_URI}
       rap.le_test: true
+      io.rancher.container.pull_image: always
     env_file:
-      .env
+      .env-prod
 
 <% if options[:rancher] -%>
 volumes:

data/templates/docker-compose.yml.erb

@@ -23,6 +23,8 @@ services:
 <% if options[:elasticsearch] -%>
   elasticsearch:
     image: elasticsearch:1.7.1
+    env_file:
+      - .env
     ports:
       - "9200"
       - "9300"

data/templates/env.conf.erb

@@ -19,4 +19,4 @@ env REGISTRY_URI;
 env SITE_URI;
 <% end -%>
 env TAG;
-env VIRUAL_PORT;
+env VIRTUAL_PORT;

data/templates/nginx.sh.erb

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+if [[ ! -e /var/log/nginx/error.log ]]; then
+        # The Nginx log forwarder might be sleeping and waiting
+        # until the error log becomes available. We restart it in
+        # 1 second so that it picks up the new log file quickly.
+        (sleep 1 && sv restart /etc/service/nginx-log-forwarder)
+fi
+
+if [ -z $PASSENGER_APP_ENV ]
+then
+    export PASSENGER_APP_ENV=development
+fi
+
+if [ $PASSENGER_APP_ENV == "production" ]
+then
+    /sbin/setuser app /bin/bash -l -c 'cd /home/app/webapp && bundle exec rake assets:precompile db:migrate'
+fi
+
+
+exec /usr/sbin/nginx

data/templates/worker.sh.erb

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# `/sbin/setuser memcache` runs the given command as the user `memcache`.
+# If you omit that part, the command will be run as root.
+
+exec /sbin/setuser app /bin/bash -l -c 'cd /home/app/webapp && ./bin/delayed_job run >>/var/log/worker.log 2>&1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack_car
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-29 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,7 @@ files:
 - templates/docker-compose.yml.erb
 - templates/env.conf.erb
 - templates/hosts.erb
+- templates/nginx.sh.erb
 - templates/ops/deploy-app
 - templates/ops/deploy.yml
 - templates/ops/provision.yml
@@ -181,6 +182,7 @@ files:
 - templates/ops/roles/docker.ubuntu/tests/vagrant.yml
 - templates/ops/roles/docker.ubuntu/vars/main.yml
 - templates/webapp.conf.erb
+- templates/worker.sh.erb
 homepage: https://gitlab.com/notch8/stack_car
 licenses: []
 metadata: {}

data/exe/sc

@@ -1 +0,0 @@
-exe/stack_car