stack_car 0.3.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2331786a667cdd1c925669949212b88fc6b9c9a6
-  data.tar.gz: db83a6aa549e9f2dce0b61e9c2cbd0ffc3cc5ee7
+  metadata.gz: 4a4a19481f704f1a40f92ca1b5cc0a6ddc43894c
+  data.tar.gz: 17075ff12216327ab447110ca5b97a612a75fbe4
 SHA512:
-  metadata.gz: c36afa299abfc85fdfaa533fbff3c2a787619d76e369c91b5b10284a94349fc38e8bb8c710759eedba0ffbf3fe4e93c93e3c4ed4d88c9b1b6f2f876676c4245f
-  data.tar.gz: 52f60ba42b4939e897e4382de82bb2dd8b083f9aa749ae1e90089ab8c836f08d8b6c8af52fe8ac971a5c87683059f7921349e6e03223eed7e144b2a8fe03ccc0
+  metadata.gz: 8b1a2102d81567db1df3c17a35b68fa9f15e76cee641c971ba76a041469a05b3733e7c54c31faf36432c6367ffe82a887a462cf52f40031590ecb8f9b8b82d7c
+  data.tar.gz: c49be685b989964efa6e7469a98f9f31e6c1932e1d77a6a3869f9d84c0264b739b5d96c8d88bf4da367ee6f572a8a6ec2441644a599d27e6a36e380ed0788c42

data/README.md

@@ -8,7 +8,6 @@ Stack Car is an opinionated set of tools around Docker and Rails.  It provides c
 ## Installation
 
 Because stack_car will be used to run your application in side of Docker, you want to install stack car in to your system Ruby instead of putting in your applications Gemfile
-u 
 
 ```bash
 gem install stack_car 
@@ -16,12 +15,11 @@ gem install stack_car
 
 ## Usage
 
-
-Commands are accesible via the "sc" short cut. Note: this will need to be in your command path in front of the spreadsheet command (sc), which is a fairly archaiac unix spreadsheet tool. We're guessing you don't edit a lot of spreadsheets in your terminal, but if you do, we also figure you can override your path order pretty easily.
+Commands are accesible via the "sc" short cut. Note: this will need to be in your command path in front of the spreadsheet command (sc), which is a fairly archaiac unix spreadsheet tool. We're guessing you don't edit a lot of spreadsheets in your terminal, but if you do, we also figure you can override your path order pretty easily.  Many of these commands have short versions or alias to make remembering them easier.  If there are obvious aliases missing, PRs are welcome.
 
 ```ruby
 Commands:
-  stack_car bundle_exec ARGS  # wraps docker-compose exec web bundle exec unless --service is used to specify
+  stack_car bundle_exec ARGS  # wraps docker-compose exec web bundle exec unless --service is used to specify (sc be ARGS)
   stack_car console ARGS      # shortcut to start rails console
   stack_car dockerize DIR     # Will copy the docker tempates in to your project, see options for supported dependencies
   stack_car exec ARGS         # wraps docker-compose exec web unless --service is used to specify

data/lib/stack_car/cli.rb

@@ -10,6 +10,10 @@ module StackCar
       File.join(File.dirname(__FILE__), '..', '..', 'templates')
     end
 
+    def self.exit_on_failure?
+      true
+    end
+
     method_option :service, default: 'web', type: :string, aliases: '-s'
     method_option :build, default: false, type: :boolean, aliases: '-b'
     method_option :logs, default: true, type: :boolean
@@ -30,6 +34,7 @@ module StackCar
       run("docker-compose stop #{options[:service]}")
       run("rm -rf tmp/pids/*")
     end
+    map down: :stop
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc "build", "builds specified service, defaults to web"
@@ -92,6 +97,7 @@ module StackCar
     desc "release ENVIRONTMENT", "tag and push and image to the registry"
     def release(environment)
       timestamp = Time.now.strftime("%Y%m%d%I%M%S")
+      sha = `git rev-parse HEAD`[0-7]
       registry = "#{ENV['REGISTRY_HOST']}#{ENV['REGISTRY_URI']}"
       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
@@ -99,6 +105,8 @@ module StackCar
       end
       run("docker tag #{registry}:#{tag} #{registry}:#{environment}-#{timestamp}")
       run("docker push #{registry}:#{environment}-#{timestamp}")
+      run("docker tag #{registry}:#{tag} #{registry}:#{sha}")
+      run("docker push #{registry}:#{sha}")
       run("docker tag #{registry}:#{tag} #{registry}:#{environment}-latest")
       run("docker push #{registry}:#{environment}-latest")
       run("docker tag #{registry}:#{tag} #{registry}:latest")
@@ -107,10 +115,10 @@ module StackCar
 
     desc "provision ENVIRONMENT", "configure the servers for docker and then deploy an image"
     def provision(environment)
-      run("ansible-playbook -i ops/hosts -l #{environment}:localhost ops/provision.yml")
+      # TODO make dotenv load a specific environment?
+      run("dotenv 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"]
@@ -123,7 +131,7 @@ module StackCar
 
     desc "deploy ENVIRONMENT", "deploy an image from the registry"
     def deploy(environment)
-      run("ansible-playbook -i ops/hosts -l #{environment}:localhost ops/deploy.yml")
+      run("dotenv ansible-playbook -i ops/hosts -l #{environment}:localhost ops/deploy.yml")
     end
 
     method_option :elasticsearch, default: false, type: :boolean, aliases: '-e'
@@ -139,6 +147,7 @@ module StackCar
     method_option :sidekiq, default: false, type: :boolean, aliases: '-sq' # TODO
     method_option :mongodb, default: false, type: :boolean, aliases: '-mg'
     method_option :memcached, default: false, type: :boolean, aliases: '-mc'
+    method_option :yarn, default: false, type: :boolean, aliases: '-y'
     desc 'dockerize DIR', 'Will copy the docker tempates in to your project, see options for supported dependencies'
     long_desc <<-DOCKERIZE
 
@@ -149,20 +158,34 @@ module StackCar
     def dockerize(dir=".")
       Dir.chdir(dir)
       @project_name = File.basename(File.expand_path(dir))
-      @db_libs = []
-      @db_libs << "libpq-dev postgresql-client" if options[:postgres]
-      @db_libs << "mysql-client" if options[:mysql]
-      @db_libs << "libc6-dev libreoffice imagemagick unzip" if options[:fcrepo]
-      @db_libs = @db_libs.join(' ')
+      apt_packages << "libpq-dev postgresql-client" if options[:postgres]
+      apt_packages << "mysql-client" if options[:mysql]
+      pre_apt << "echo 'Downloading Packages'"
+      post_apt << "echo 'Packages Downloaded'"
+
+      if options[:yarn]
+        apt_packages << 'yarn'
+        pre_apt << "curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -"
+        pre_apt << "echo 'deb https://dl.yarnpkg.com/debian/ stable main' | tee /etc/apt/sources.list.d/yarn.list"
+        post_apt << "yarn config set no-progress"
+        post_apt << "yarn config set silent"
+      end
+
+      if options[:fcrepo]
+        apt_packages << "libc6-dev libreoffice imagemagick unzip ghostscript ffmpeg"
 
+        post_apt << "mkdir -p /opt/fits"
+        post_apt << "curl -fSL -o /opt/fits-1.0.5.zip http://projects.iq.harvard.edu/files/fits/files/fits-1.0.5.zip"
+        post_apt << "cd /opt && unzip fits-1.0.5.zip && chmod +X fits-1.0.5/fits.sh"
+      end
 
-     ['.dockerignore', 'Dockerfile', 'docker-compose.yml', 'docker-compose-ci.yml', 'docker-compose-prod.yml', '.gitlab-ci.yml', '.env'].each do |template_file|
+     ['.dockerignore', 'Dockerfile', 'Dockerfile.base', 'docker-compose.yml', 'docker-compose.ci.yml', 'docker-compose.production.yml', '.gitlab-ci.yml', '.env'].each do |template_file|
        puts template_file
         template("#{template_file}.erb", template_file)
      end
      template("database.yml.erb", "config/database.yml")
-     template(".env.erb", ".env-example")
-     template(".env.erb", ".env-prod")
+     template(".env.development.erb", ".env.development")
+     template(".env.erb", ".env.production")
 
      if File.exists?('README.md')
        prepend_to_file "README.md" do
@@ -173,9 +196,10 @@ module StackCar
          File.read("#{self.class.source_root}/README.md")
        end
      end
+     append_to_file("Gemfile", "gem 'activerecord-nulldb-adapter'")
       if options[:deploy] || options[:rancher]
         directory('ops')
-        ['hosts'].each do |template_file|
+        ['hosts', 'deploy.yml', 'provision.yml'].each do |template_file|
           template("#{template_file}.erb", "ops/#{template_file}")
         end
         say 'Please update ops/hosts with the correct server addresses'
@@ -187,6 +211,8 @@ module StackCar
       ['env.conf', 'webapp.conf', 'worker.sh', 'nginx.sh'].each do |template_file|
         template("#{template_file}.erb", "ops/#{template_file}")
       end
+
+      say 'Please find and replace all CHANGEME lines'
     end
 
     protected
@@ -200,5 +226,30 @@ module StackCar
       end
       return @compose_depends.join("\n")
     end
+
+    def apt_packages
+      @apt_packages ||= []
+    end
+
+    def apt_packages_string
+      apt_packages.join(" ")
+    end
+
+    def pre_apt
+      @pre_apt ||= []
+    end
+
+    def pre_apt_string
+      pre_apt.join(" && \\\n")
+    end
+
+    def post_apt
+      @post_apt ||= []
+    end
+
+    def post_apt_string
+      post_apt.join(" && \\\n")
+    end
+
   end
 end

data/lib/stack_car/version.rb

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

data/templates/.dockerignore.erb

@@ -1,6 +1,8 @@
 .bundle
 .convox
 .env
+.env.*
+node_modules
 .git
 db/*.sqlite3
 db/*.sqlite3-journal

data/templates/.env.development.erb

@@ -0,0 +1 @@
+# Items in this file override those in .env and are good for developer system specific preferences

data/templates/.env.erb

@@ -3,6 +3,7 @@ POSTGRES_DB=<%= @project_name %>
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=DatabaseFTW
 POSTGRES_HOST=postgres
+DB_ADAPTER=postgresql
 TEST_DB=<%= @project_name %>_test
 <% end -%>
 <% if options[:mysql] -%>
@@ -11,17 +12,19 @@ MYSQL_USER=root
 MYSQL_PASSWORD=DatabaseFTW
 MYSQL_ROOT_PASSWORD=DatabaseFTW
 MYSQL_HOST=mysql
+DB_ADAPTER=mysql2
 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 %>
-SITE_URI=https://TODO.com
-DEPLOY_HOOK=TODO
+SITE_URI=https://CHANGEME.com
+DEPLOY_HOOK=CHANGEME
 <% end -%>
+REGISTRY_HOST=registry.gitlab.com
+REGISTRY_URI=/CHANGEME/<%= @project_name %>
 TAG=dev
 VIRTUAL_PORT=80
 PASSENGER_APP_ENV=development
+DOCKER_PORT=3000:80

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

@@ -1,4 +1,4 @@
-image: docker:latest
+image: $CI_REGISTRY_IMAGE/builder:latest
 services:
   - docker:dind
 <% if options[:postgres] -%>
@@ -44,14 +44,22 @@ variables:
   REGISTRY_URI: TODO/<%= @project_name %>
   SITE_URI_BASE: TODO
 
+
+before_script:
+  - export REGISTRY_FULL=registry.gitlab.com/notch8/ror-site/$CI_COMMIT_REF_SLUG:${CI_COMMIT_SHA:0:8}
+  - export TAG=$CI_COMMIT_REF_SLUG
+  - eval $(ssh-agent -s)
+  - bash
+  - ssh-add <(echo "$SSH_PRIVATE_KEY") 
+  - mkdir -p ~/.ssh
+  - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+
 build:
   stage: build
   script:
     - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
-    - 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
+    - sc build
+    - sc push
   tags:
     - docker
 
@@ -59,7 +67,7 @@ test:
   stage: test
   image: $CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
   script:
-    - cd /app && bundle exec rake db:create db:schema:load spec
+    - cd /home/app/webapp && bundle exec rake db:create db:schema:load spec
   tags:
     - docker
   variables:
@@ -67,11 +75,10 @@ test:
 
 review:
   stage: review
-  image: docker:latest
   type: deploy
   environment:
-    name: $CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
-    url: http://web.$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG.staging.$SITE_URI_BASE
+    name: $CI_PROJECT_NAME-$CI_COMMIT_REF_SLUG
+    url: http://web.$CI_PROJECT_NAME-$CI_COMMIT_REF_SLUG.staging.$SITE_URI_BASE
     on_stop: stop_review
   only:
     - branches
@@ -79,15 +86,12 @@ review:
     - 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_PROJECT_NAME-$CI_BUILD_REF_SLUG
-    - ./rancher-v0.4.1/rancher up -p -d -u -c -s $TAG -f docker-compose-ci.yml
+    - sc provision ci
+<% else %>
+    - CHANGME
 <% end %>
-  variables:
-    GIT_STRATEGY: fetch
-  tags:
+ tags:
     - docker
     - mysql
 
@@ -95,13 +99,9 @@ stop_review:
   stage: review
   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
-    - ./rancher-v0.4.1/rancher rm $CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
+    - rancher rm $CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
 <% end %>
-  variables:
-    GIT_STRATEGY: none
   when: manual
   environment:
     name: $CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
@@ -112,16 +112,13 @@ staging:
   type: deploy
   script:
 <% if options[:rancher] -%>
-    - ./ops/deploy-app
+    - sc deploy staging 
 <% end -%>
 <% if options[:heroku] -%>
-  - gem install dpl multi_json
   - dpl --provider=heroku --app=<%= @project_name %>-staging --api-key=$HEROKU_STAGING_API_KEY --run="bundle exec rake db:migrate"
 <% end -%>
   only:
     - master
-  variables:
-    GIT_STRATEGY: fetch
   tags:
     - docker
 
@@ -130,16 +127,13 @@ production:
   type: deploy
   script:
 <% if options[:rancher] -%>
-    - ./ops/deploy-app
+    - sc deploy production
 <% end -%>
 <% if options[:heroku] -%>
-  - gem install dpl multi_json
   - dpl --provider=heroku --app=<%= @project_name %> --api-key=$HEROKU_PRODUCTION_API_KEY --run="bundle exec rake db:migrate"
 <% end -%>
   when: manual
   only:
     - master
-  variables:
-    GIT_STRATEGY: fetch
   tags:
     - docker

data/templates/Dockerfile.base.erb

@@ -0,0 +1,48 @@
+FROM phusion/passenger-ruby23:0.9.28
+
+RUN <%= pre_apt_string %> && \
+    curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
+    apt-get update -qq && \
+    apt-get install -y build-essential nodejs pv tzdata libsasl2-dev <%= apt_packages_string %> && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+    <%= post_apt_string %>
+
+<% if options[:fcrepo] %>
+RUN mkdir -p /opt/fits && \
+    curl -fSL -o /opt/fits-0.8.5.zip http://projects.iq.harvard.edu/files/fits/files/fits-0.8.5.zip && \
+    cd /opt && \
+    unzip fits-0.8.5.zip && \
+    chmod +x fits-0.8.5/fits.sh
+
+<% end -%>
+
+RUN rm /etc/nginx/sites-enabled/default
+
+ENV APP_HOME /home/app/webapp
+RUN mkdir $APP_HOME
+WORKDIR $APP_HOME
+
+ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
+  BUNDLE_JOBS=4
+
+ADD Gemfile* $APP_HOME/
+RUN bundle check || bundle install
+
+<% if options[:delayed_job] || options[:sidekiq] %>
+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 %>
+
+ADD . $APP_HOME
+RUN chown -R app $APP_HOME
+
+# this is so that these items are cached and only have to be updated
+RUN  /sbin/setuser app /bin/bash -l -c 'cd /home/app/webapp && DB_ADAPTER=nulldb bundle exec rake assets:precompile'
+# 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
+

data/templates/Dockerfile.builder.erb

@@ -0,0 +1,13 @@
+FROM docker:latest
+
+RUN apk update && \
+    apk add bash git ruby-json ansible openssh && \
+    gem install stack_car --no-ri --no-rdoc && \
+<% 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 && \
+    mv rancher-v0.4.1/rancher /bin/rancher
+<% end %>
+<% if options[:heroku] %>
+    gem install dpl multi_json --no-ri --no-rdoc
+<% end %>

data/templates/Dockerfile.erb

@@ -1,45 +1,14 @@
-FROM phusion/passenger-ruby23:0.9.20
-
-RUN apt-get update -qq && apt-get install -y build-essential nodejs npm pv libsasl2-dev <%= @db_libs %> && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-<% if options[:fcrepo] %>
-RUN mkdir -p /opt/fits && \
-    curl -fSL -o /opt/fits-0.8.5.zip http://projects.iq.harvard.edu/files/fits/files/fits-0.8.5.zip && \
-    cd /opt && \
-    unzip fits-0.8.5.zip && \
-    chmod +x fits-0.8.5/fits.sh
-
-<% end -%>
-
-RUN rm /etc/nginx/sites-enabled/default
-COPY ops/webapp.conf /etc/nginx/sites-enabled/webapp.conf
-COPY ops/env.conf /etc/nginx/main.d/env.conf
-
-ENV APP_HOME /home/app/webapp
-RUN mkdir $APP_HOME
-WORKDIR $APP_HOME
-
-ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
-  BUNDLE_JOBS=4
-
-ADD Gemfile* $APP_HOME/
-RUN bundle check || bundle install
-
-<% if options[:delayed_job] %>
-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
-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
+FROM CHANGEME/base:latest
+
+ADD https://time.is/just build-time
+ADD ops/webapp.conf /etc/nginx/sites-enabled/webapp.conf
+ADD ops/env.conf /etc/nginx/main.d/env.conf
+ADD . $APP_HOME
+
+RUN cd /home/app/webapp && \
+    (/sbin/setuser app bundle check || /sbin/setuser app bundle install) && \
+    /sbin/setuser app bundle exec rake assets:precompile DB_ADAPTER=nulldb && \
+    chown -R app $APP_HOME && \
+    rm -f /etc/service/nginx/down
 
 CMD ["/sbin/my_init"]

data/templates/README.md

@@ -2,9 +2,9 @@
 
 1) Install Docker.app 
 
-2) Get .env file from team member or copy it from .env-example and fill it out
+2) gem install stack_car
 
-3) gem install stack_car
+3) We recommend committing .env to your repo with good defaults. .env.development, .env.production etc can be used for local overrides and should not be in the repo.
 
 4) sc up
 

data/templates/database.yml.erb

@@ -3,18 +3,23 @@
 <% if options[:mysql] -%>
 login: &login
   adapter: mysql2
+  adapter: <%%= ENV['DB_ADAPTER'] %>
   host: <%%= ENV['MYSQL_HOST'] %>
   username: <%%= ENV['MYSQL_USER'] %>
   password: <%%= ENV['MYSQL_PASSWORD'] %>
   database: <%%= ENV['MYSQL_DATABASE'] %>
+  pool: 5
+  timeout: 5000
 <% end -%>
 <% if options[:postgres] -%>
 login: &login
-  adapter: postgresql
+  adapter: <%%= ENV['DB_ADAPTER'] %>
   host: <%%= ENV['POSTGRES_HOST'] %>
   username: <%%= ENV['POSTGRES_USER'] %>
   password: <%%= ENV['POSTGRES_PASSWORD'] %>
   database: <%%= ENV['POSTGRES_DB'] %>
+  pool: 5
+  timeout: 5000
 <% end -%>
 
 

data/templates/{ops/deploy.yml → deploy.yml.erb}

@@ -1,6 +1,7 @@
 ---
 - name: Deploy
   hosts: all
+<% if options[:docker] %>
   become: true
   vars_prompt:
     - name: "registry_user"
@@ -47,3 +48,18 @@
 #      register: output
 #
     - debug: var=output
+<% end %>
+<% if options[:rancher] %>
+  gather_facts: False
+  tasks:
+    - name: deploy app 
+      delegate_to: 127.0.0.1
+      uri: 
+        url: "{{ deploy_url }}"
+        method: POST
+        return_content: yes
+        body: { "push_data": { "tag": "{{ tag }}" }, "repository": { "repo_name":"registry.gitlab.com/notch8/ror-site/{{ app_name | regex_replace('-staging', '') }}" }}
+        body_format: json
+        status_code: 200
+
+<% end %>

data/templates/{docker-compose-ci.yml.erb → docker-compose.ci.yml.erb}

@@ -4,7 +4,7 @@ services:
   postgres:
     image: postgres
     env_file:
-      - .env-example
+      - .env
     ports:
       - "5432"
 <% end -%>
@@ -12,13 +12,15 @@ services:
   mysql:
     image: mysql
     env_file:
-      - .env-example
+      - .env
     ports:
       - '3306'
 <% end -%>
 <% if options[:elasticsearch] -%>
   elasticsearch:
     image: elasticsearch:1.7.1
+    env_file:
+      - .env
     ports:
       - "9200"
       - "9300"
@@ -26,6 +28,8 @@ services:
 <% if options[:solr] %>
   solr:
     image: solr:latest
+    env_file:
+      - .env
     ports:
       - "8983"
     entrypoint:
@@ -37,6 +41,8 @@ services:
 <% if options[:redis] -%>
   redis:
     image: 'redis:3.2-alpine'
+    env_file:
+      - .env
     command: redis-server
     ports:
       - '6379'
@@ -44,18 +50,24 @@ services:
 <% if options[:mongodb] -%>
   mongodb:
     image: mongo:2.6.12
+    env_file:
+      - .env
     ports:
       - "27017"
 <% end -%>
 <% if options[:memcached] -%>
   memcached:
     image: memcached
+    env_file:
+      - .env
     ports:
       - "11211"
 <% end -%>
 <% if options[:fcrepo] -%>
   fcrepo:
     image: botimer/fcrepo:4.5.1
+    env_file:
+      - .env
     volumes:
       - 'fcrepo:/opt/data'
     ports:
@@ -64,8 +76,7 @@ services:
   web:
     image: "${REGISTRY_HOST}${REGISTRY_URI}:${TAG:-master}"
     env_file:
-      - .env-example
-    labels:
+      - .env
       rap.host: ${SITE_URI}
       rap.le_host: ${SITE_URI}
       rap.le_test: true

data/templates/{docker-compose-prod.yml.erb → docker-compose.production.yml.erb}

@@ -15,7 +15,8 @@ services:
       rap.le_test: true
       io.rancher.container.pull_image: always
     env_file:
-      .env-prod
+      - .env
+      - .env.production
 
 <% if options[:rancher] -%>
 volumes:

data/templates/docker-compose.yml.erb

@@ -5,6 +5,7 @@ services:
     image: postgres
     env_file:
       - .env
+      - .env.development
     ports:
       - "5432"
     volumes:
@@ -15,6 +16,7 @@ services:
     image: mysql
     env_file:
       - .env
+      - .env.development
     ports:
       - '3306'
     volumes:
@@ -25,6 +27,7 @@ services:
     image: elasticsearch:1.7.1
     env_file:
       - .env
+      - .env.development
     ports:
       - "9200"
       - "9300"
@@ -34,6 +37,9 @@ services:
 <% if options[:solr] %>
   solr:
     image: solr:latest
+    env_file:
+      - .env
+      - .env.development
     ports:
       - "8983"
     volumes:
@@ -47,6 +53,9 @@ services:
 <% if options[:redis] -%>
   redis:
     image: 'redis:3.2-alpine'
+    env_file:
+      - .env
+      - .env.development
     command: redis-server
     ports:
       - '6379'
@@ -56,6 +65,9 @@ services:
 <% if options[:mongodb] -%>
   mongodb:
     image: mongo:2.6.12
+    env_file:
+      - .env
+      - .env.development
     volumes:
       - 'mongodb:/data/db'
     ports:
@@ -64,31 +76,45 @@ services:
 <% if options[:memcached] -%>
   memcached:
     image: memcached
+    env_file:
+      - .env
+      - .env.development
     ports:
       - "11211"
 <% end -%>
 <% if options[:fcrepo] -%>
   fcrepo:
     image: botimer/fcrepo:4.5.1
+    env_file:
+      - .env
+      - .env.development
     volumes:
       - 'fcrepo:/opt/data'
     ports:
       - "8080"
 <% end -%>
+
+  base:
+    image: "${REGISTRY_HOST}${REGISTRY_URI}/base:latest"
+    build:
+      context: .
+      dockerfile: Dockerfile.base
+
   web:
     build: .
     image: "${REGISTRY_HOST}${REGISTRY_URI}:${TAG:-master}"
-    volumes:
-      - .:/home/app/webapp
     env_file:
       - .env
+      - .env.development
+    volumes:
+      - .:/home/app/webapp
     # 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
     ports:
-      - "80"
+      - "${DOCKER_PORT}"
     depends_on:
 <%= compose_depends %>
 
@@ -111,3 +137,6 @@ volumes:
 <% if options[:mongodb] -%>
   mongodb:
 <% end -%>
+<% if options[:fcrepo] -%>
+  fcrepo:
+<% end -%>

data/templates/hosts.erb

@@ -1,3 +1,6 @@
+[ci]
+XX.XXX.XXX.XXX
+
 [staging]
 XX.XXX.XXX.XXX ansible_user=centos
 
@@ -5,16 +8,40 @@ XX.XXX.XXX.XXX ansible_user=centos
 XX.XXX.XXX.XXX ansible_user=ubuntu
 
 [servers:children]
+ci
 staging
 production
 
 [servers:vars]
 registry_host=registry.gitlab.com
+<% if options[:docker] -%>
 compose_dir=/var/www
+<% end %>
 project_name=<%= @project_name %>
 
+[ci:vars]
+tag=staging-latest
+deploy_env=staging
+app_name=CHANGEME
+<% if options[:rancher] %>
+rancher_env=CHANGEME
+deploy_url=CHANGEME
+<% end %>
+
 [staging:vars]
 tag=staging-latest
+deploy_env=staging
+app_name=CHANGEME
+<% if options[:rancher] %>
+rancher_env=CHANGEME
+deploy_url=CHANGEME
+<% end %>
 
 [production:vars]
 tag=production-latest
+deploy_env=production
+app_name=CHANGEME
+<% if options[:rancher] %>
+rancher_env=CHANGEME
+deploy_url=CHANGEME
+<% end %>

data/templates/nginx.sh.erb

@@ -12,10 +12,9 @@ then
     export PASSENGER_APP_ENV=development
 fi
 
-if [ $PASSENGER_APP_ENV == "production" ]
+if [[ $PASSENGER_APP_ENV == "production" ]] || [[ $PASSENGER_APP_ENV == "staging" ]]
 then
-    /sbin/setuser app /bin/bash -l -c 'cd /home/app/webapp && bundle exec rake assets:precompile db:migrate'
+    /sbin/setuser app /bin/bash -l -c 'cd /home/app/webapp && bundle exec rake db:migrate'
 fi
 
-
 exec /usr/sbin/nginx

data/templates/provision.yml.erb

@@ -0,0 +1,32 @@
+---
+- name: Set up Docker on host
+  hosts: all
+<% if options[:docker] %>
+  become: true
+  roles:
+    - docker.ubuntu
+  tasks:
+    - name: Install Compose Module
+      pip: name=docker-compose
+    - name: Upload docker-compose files
+      synchronize:
+        src: ../.env
+        dest: "{{ compose_dir }}/{{ project_name }}_env"
+
+
+- include: deploy.yml
+<% end %>
+<% if options[:rancher] %>
+  gather_facts: False
+  tasks:
+    - name: Provision via rancher
+      shell: "cd .. && rancher up -p -d -u -s {{ app_name }} -f docker-compose.{{ deploy_env }}.yml -e .env.{{ app_name | regex_replace('-staging', '') }}.{{ deploy_env }}"
+      register: result
+      delegate_to: 127.0.0.1
+      environment:
+        APP_NAME: "{{ app_name | regex_replace('-staging', '') }}"
+        TAG: "{{ tag }}"
+        RANCHER_ENVIRONMENT: "{{ rancher_env }}"
+    - debug: var=result.stdout_lines
+- include: deploy.yml
+<% end %>

data/templates/webapp.conf.erb

@@ -12,4 +12,4 @@ server {
     # The following deploys your Ruby/Python/Node.js/Meteor app on Passenger.
     passenger_enabled on;
     passenger_user app;
-}
+}

data/templates/worker.sh.erb

@@ -2,5 +2,9 @@
 
 # `/sbin/setuser memcache` runs the given command as the user `memcache`.
 # If you omit that part, the command will be run as root.
+<% if options[:sidekiq] %>
+exec /sbin/setuser app /bin/bash -l -c 'cd /home/app/webapp && bundle exec sidekiq >>/var/log/worker.log 2>&1'<% end %>
 
+<% if options[:delayed_job] %>
 exec /sbin/setuser app /bin/bash -l -c 'cd /home/app/webapp && ./bin/delayed_job run >>/var/log/worker.log 2>&1'
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack_car
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,20 +151,21 @@ files:
 - public/logo.pxm
 - stack_car.gemspec
 - templates/.dockerignore.erb
+- templates/.env.development.erb
 - templates/.env.erb
 - templates/.gitlab-ci.yml.erb
+- templates/Dockerfile.base.erb
+- templates/Dockerfile.builder.erb
 - templates/Dockerfile.erb
 - templates/README.md
 - templates/database.yml.erb
-- templates/docker-compose-ci.yml.erb
-- templates/docker-compose-prod.yml.erb
+- templates/deploy.yml.erb
+- templates/docker-compose.ci.yml.erb
+- templates/docker-compose.production.yml.erb
 - 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
 - templates/ops/roles/docker.centos/README.md
 - templates/ops/roles/docker.centos/tasks/main.yml
 - templates/ops/roles/docker.ubuntu/.travis.yml
@@ -181,6 +182,7 @@ files:
 - templates/ops/roles/docker.ubuntu/templates/docker.conf
 - templates/ops/roles/docker.ubuntu/tests/vagrant.yml
 - templates/ops/roles/docker.ubuntu/vars/main.yml
+- templates/provision.yml.erb
 - templates/webapp.conf.erb
 - templates/worker.sh.erb
 homepage: https://gitlab.com/notch8/stack_car

data/templates/ops/deploy-app

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -x
-
-curl -X POST -H "Content-Type: application/json" -d '{ "push_data": { "tag": "$TAG" }, "repository": { "repo_name":"$REGISTRY_HOST$REGISTRY_URI" }}' $DEPLOY_HOOK

data/templates/ops/provision.yml

@@ -1,17 +0,0 @@
----
-- name: Set up Docker on host
-  hosts: all
-  become: true
-  roles:
-    - docker.ubuntu
-  tasks:
-    - name: Install Compose Module
-      pip: name=docker-compose
-    - name: Upload docker-compose files
-      synchronize: 
-        src: ../.env
-        dest: "{{ compose_dir }}/{{ project_name }}_env"
-
- 
-
-- include: deploy.yml