stack_car 0.9.0 → 0.12.0

data/templates/chart/templates/web-ing-wildcard.yaml

@@ -0,0 +1,20 @@
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "app.web.name" . }}-in-wildcard
+  annotations:
+    # kubernetes.io/ingress.allow-http: "false"
+    # for GKE
+    # kubernetes.io/ingress.global-static-ip-name: rails-k8s-app
+spec:
+  # tls:
+  # - hosts:
+  #   - {{ .Values.ingress.host }}
+  rules:
+  - host: "*.{{ .Values.ingress.host }}"
+    http:
+      paths:
+      - backend:
+          serviceName: {{ template "app.web.name" . }}
+          servicePort: 80

data/templates/chart/templates/web-ing.yaml

@@ -0,0 +1,20 @@
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "app.web.name" . }}-in
+  annotations:
+  {{- range $key, $value := .Values.ingress.annotations }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
+spec:
+  # tls:
+  # - hosts:
+  #   - {{ .Values.ingress.host }}
+  rules:
+  - host: "{{ .Values.ingress.host }}"
+    http:
+      paths:
+      - backend:
+          serviceName: {{ template "app.web.name" . }}
+          servicePort: 80

data/templates/chart/templates/web-svc.yaml

@@ -0,0 +1,20 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "app.web.name" . }}
+  labels:
+    app: {{ template "app.name" . }}
+    chart: {{ template "app.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+    component: web
+spec:
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+  selector:
+    app: {{ template "app.name" . }}
+    release: {{ .Release.Name }}
+    component: web

data/templates/database.yml.erb

@@ -3,21 +3,21 @@
 <% 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'] %>
+  adapter: <%%= ENV['DATABASE_ADAPTER'] %>
+  host: <%%= ENV['DATABASE_HOST'] %>
+  username: <%%= ENV['DATABASE_USER'] %>
+  password: <%%= ENV['DATABASE_PASSWORD'] %>
+  database: <%%= ENV['DATABASE_NAME'] %>
   pool: 5
   timeout: 5000
 <% end -%>
 <% if options[:postgres] -%>
 login: &login
-  adapter: <%%= ENV['DB_ADAPTER'] %>
-  host: <%%= ENV['POSTGRES_HOST'] %>
-  username: <%%= ENV['POSTGRES_USER'] %>
-  password: <%%= ENV['POSTGRES_PASSWORD'] %>
-  database: <%%= ENV['POSTGRES_DB'] %>
+  adapter: <%%= ENV['DATABASE_ADAPTER'] %>
+  host: <%%= ENV['DATABASE_HOST'] %>
+  username: <%%= ENV['DATABASE_USER'] %>
+  password: <%%= ENV['DATABASE_PASSWORD'] %>
+  database: <%%= ENV['DATABASE_NAME'] %>
   pool: 5
   timeout: 5000
 <% end -%>

data/templates/docker-compose.yml.erb

@@ -2,10 +2,11 @@ version: '2.1'
 services:
 <% if options[:postgres] -%>
   postgres:
-    image: postgres
-    env_file:
-      - .env
-      - .env.development
+    image: postgres:11.1
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=DatabaseFTW
+      - POSTGRES_DB=<%= @project_name %>
     ports:
       - "5432"
     volumes:
@@ -13,10 +14,12 @@ services:
 <% end -%>
 <% if options[:mysql] -%>
   mysql:
-    image: mysql
-    env_file:
-      - .env
-      - .env.development
+    image: mysql:5.7
+    environment:
+      - MYSQL_DATABASE=<%= @project_name %>
+      - MYSQL_USER=<%= @project_name %>
+      - MYSQL_PASSWORD=DatabaseFTW
+      - MYSQL_ROOT_PASSWORD=DatabaseFTW
     ports:
       - '3306'
     volumes:
@@ -99,25 +102,61 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.base
+      args:
+        DEPLOY_KEY: "${DEPLOY_KEY}"
+        APP_NAME: "${APP_NAME}"
+        REPO_URL: "${REPO_URL}"
+    env_file:
+      - .env
+      - .env.development
 
-  web:
-    build: .
+  app:
+    build:
+      context: ..
+      dockerfile: stack_car/Dockerfile
+      args:
+        DEPLOY_KEY: "${DEPLOY_KEY}"
+        REPO_URL: "${REPO_URL}"
+        BRANCH: "${BRANCH}"
     image: "${REGISTRY_HOST}${REGISTRY_URI}:${TAG:-master}"
     env_file:
       - .env
       - .env.development
     volumes:
-      - .:/home/app/webapp
+      - .:/home/app/webapp:cached
+      - node_modules:/home/app/webapp/node_modules
+      - tmp_cache:/home/app/webapp/tmp/cache
     # 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
+
+  web:
+    extends:
+      app:
     ports:
-      - "${DOCKER_PORT}"
+      - "${WEB_PORT}"
+    environment:
+      - VIRTUAL_HOST=<%= @project_name %>.docker
+      - VIRTUAL_PORT=80
     depends_on:
 <%= compose_depends %>
 
+<% if options[:delayed_job] %>
+  worker:
+    extends: app
+    command: ./bin/delayed_job run
+<%= compose_depends %>
+<% end %>
+
+<% if options[:sidekiq] %>
+  worker:
+    extends: app
+    command: bundle exec sidekiq
+<%= compose_depends %>
+<% end %>
+
 volumes:
 <% if options[:postgres] -%>
   postgres:
@@ -140,3 +179,5 @@ volumes:
 <% if options[:fcrepo] -%>
   fcrepo:
 <% end -%>
+  tmp_cache:
+  node_modules:

data/templates/env.conf.erb

@@ -1,18 +1,18 @@
 <% if options[:postgres] -%>
-env DB_ADAPTER;
-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 DB_ADAPTER;
-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.9.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Rob Kaufman
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2021-03-26 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
@@ -158,10 +173,33 @@ files:
 - 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 +226,7 @@ files:
 homepage: https://gitlab.com/notch8/stack_car
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -203,9 +241,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/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 %>