stack_car 0.7.1 → 0.13.0

data/templates/env.conf.erb

@@ -1,16 +1,18 @@
 <% if options[:postgres] -%>
-env POSTGRES_DB;
-env POSTGRES_USER;
-env POSTGRES_PASSWORD;
-env POSTGRES_HOST;
+env DATABASE_ADAPTER;
+env DATABASE_NAME;
+env DATABASE_USER;
+env DATABASE_PASSWORD;
+env DATABASE_HOST;
 env TEST_DB;
 <% end -%>
 <% if options[:mysql] -%>
-env MYSQL_DATABASE;
-env MYSQL_USER;
-env MYSQL_PASSWORD;
-env MYSQL_ROOT_PASSWORD;
-env MYSQL_HOST;
+env DATABASE_ADAPTER;
+env DATABASE_NAME;
+env DATABASE_USER;
+env DATABASE_PASSWORD;
+env DATABASE_ROOT_PASSWORD;
+env DATABASE_HOST;
 env TEST_DB;
 <% end -%>
 <% if options[:deploy] || options[:rancher] -%>

data/templates/nginx.sh.erb

@@ -12,9 +12,26 @@ then
     export PASSENGER_APP_ENV=development
 fi
 
+rm -rf /home/app/webapp/.ruby*
+
+declare -p | grep -Ev 'BASHOPTS|PWD|BASH_VERSINFO|EUID|PPID|SHELLOPTS|UID' > /container.env
+
+if [[ $PASSENGER_APP_ENV == "development" ]] || [[ $PASSENGER_APP_ENV == "test" ]]
+then
+    /sbin/setuser app /bin/bash -l -c 'cd /home/app/webapp && bundle exec rails db:create db:migrate db:test:prepare'
+fi
+
 if [[ $PASSENGER_APP_ENV == "production" ]] || [[ $PASSENGER_APP_ENV == "staging" ]]
 then
+    /bin/bash -l -c 'chown -R app:app /home/app/webapp/tmp' # mounted volume may have wrong permissions
+    /bin/bash -l -c 'chown -R app:app /home/app/webapp/public' # mounted volume may have wrong permissions
     /sbin/setuser app /bin/bash -l -c 'cd /home/app/webapp && bundle exec rake db:migrate'
+    if [ -d /home/app/webapp/public/assets-new ]; then
+        /sbin/setuser app /bin/bash -l -c 'cd /home/app/webapp && rsync -a public/assets-new/ public/assets/'
+    fi
+    if [ -d /home/app/webapp/public/packs-new ]; then
+        /sbin/setuser app /bin/bash -l -c 'cd /home/app/webapp && rsync -a public/packs-new/ public/packs/'
+    fi
 fi
 
 exec /usr/sbin/nginx

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack_car
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Rob Kaufman
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-description: 
+description:
 email:
 - rob@notch8.com
 executables:
@@ -144,6 +158,7 @@ files:
 - exe/stack_car
 - lib/stack_car.rb
 - lib/stack_car/cli.rb
+- lib/stack_car/dot_rc.rb
 - lib/stack_car/version.rb
 - logo.jpg
 - public/.gitkeep
@@ -154,14 +169,36 @@ files:
 - 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/chart-fcrepo/fcrepo-deploy.yaml
+- templates/chart-fcrepo/fcrepo-env-cm.yaml
+- templates/chart-fcrepo/fcrepo-env-secret.yaml.tt
+- templates/chart-fcrepo/fcrepo-pvc.yaml
+- templates/chart-fcrepo/fcrepo-svc.yaml
+- templates/chart-sidekiq/sidekiq-deploy.yaml
+- templates/chart/.gitignore
+- templates/chart/.helmignore
+- templates/chart/Chart.yaml.tt
+- templates/chart/README.md
+- templates/chart/bin/check_sidekiq.rb
+- templates/chart/bin/decrypt
+- templates/chart/bin/deploy
+- templates/chart/bin/encrypt
+- templates/chart/bin/remove
+- templates/chart/sample-values.yaml.tt
+- templates/chart/templates/_helpers.tpl.tt
+- templates/chart/templates/rails-env-cm.yaml.tt
+- templates/chart/templates/rails-env-secret.yaml
+- templates/chart/templates/rails-pvc-shared.yml
+- templates/chart/templates/setup-job.yaml
+- templates/chart/templates/web-deploy.yaml
+- templates/chart/templates/web-ing-wildcard.yaml
+- templates/chart/templates/web-ing.yaml
+- templates/chart/templates/web-svc.yaml
 - templates/database.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
@@ -188,7 +225,7 @@ files:
 homepage: https://gitlab.com/notch8/stack_car
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -203,9 +240,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: A tool to make rails + docker easy
 test_files: []

data/templates/Dockerfile.base.erb

@@ -1,48 +0,0 @@
-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/docker-compose.ci.yml.erb

@@ -1,87 +0,0 @@
-version: '2.1'
-services:
-<% if options[:postgres] -%>
-  postgres:
-    image: postgres
-    env_file:
-      - .env
-    ports:
-      - "5432"
-<% end -%>
-<% if options[:mysql] -%>
-  mysql:
-    image: mysql
-    env_file:
-      - .env
-    ports:
-      - '3306'
-<% end -%>
-<% if options[:elasticsearch] -%>
-  elasticsearch:
-    image: elasticsearch:1.7.1
-    env_file:
-      - .env
-    ports:
-      - "9200"
-      - "9300"
-<% end -%>
-<% if options[:solr] %>
-  solr:
-    image: solr:latest
-    env_file:
-      - .env
-    ports:
-      - "8983"
-    entrypoint:
-      - docker-entrypoint.sh
-      - solr-precreate
-      - mycore
-    # docker-compose exec --user=solr solr bin/solr create_core -c CORENAME
-<% end -%>
-<% if options[:redis] -%>
-  redis:
-    image: 'redis:3.2-alpine'
-    env_file:
-      - .env
-    command: redis-server
-    ports:
-      - '6379'
-<% end -%>
-<% 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:
-      - "8080"
-<% end -%>
-  web:
-    image: "${REGISTRY_HOST}${REGISTRY_URI}:${TAG:-master}"
-    env_file:
-      - .env
-      rap.host: ${SITE_URI}
-      rap.le_host: ${SITE_URI}
-      rap.le_test: true
-      io.rancher.container.pull_image: always
-    ports:
-      - "80"
-    depends_on:
-<%= compose_depends %>

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

@@ -1,26 +0,0 @@
-version: '2.1'
-services:
-  web:
-    image: "${REGISTRY_HOST}${REGISTRY_URI}:${TAG:-master}"
-    environment:
-      - RAILS_ENV=production
-      - RACK_ENV=production
-      - PASSENGER_APP_ENV=production
-    restart: unless-stopped
-    ports:
-      - "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.production
-
-<% if options[:rancher] -%>
-volumes:
-  uploads:
-    driver: rancher-nfs
-    external: true
-<% end -%>