stack_car 0.12.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e8df8e8dbd70e738de0a61cd09489c72e4cd822326b237269d21ebe4dacd258
-  data.tar.gz: 11214bdf66ad316ad4feec518f0ef0e39f9e146aea500c3b7e187a67ecaa33fe
+  metadata.gz: e6cc442f70a939d0c26964b5b37fab7c115ce5de2c1c7ad2decf317854028b4b
+  data.tar.gz: a245e1232281276530a1b16be06a2baedf938eb39db836d39786f99cd52a2264
 SHA512:
-  metadata.gz: 65b81508cd79dd4fdff903820133034b4dc894eeaff69a3033e2439b9cae81f5b34e48055a83485e56f3236ea7111cc9dc24d3c8a3a8cdb8341a5b64490e070a
-  data.tar.gz: 60223a2ce56c3173e4c62b8d08e05e1d8c6c5fcd2c64027864cef6aa76857c88e3b9a9ae2d6c88cd4a229f2c858f1f1359959b849faffe129119258500b97b2c
+  metadata.gz: 7108eaf37d7a5f0ae241eb6365a93d731329c04cbe13571002894ae4c80192893512dc29a1a32f95dfd15d3309682290682a2efa381b93dcce894c1e551072ae
+  data.tar.gz: d23c829079977213a1877733c8f814041df4afb258269861311184e5044ded8b5dcda760b31c3ec4a9e6e5ea8f8a23d43f23ad65f385e329271db2b2d50f985b

data/.gitlab-ci.yml

@@ -1,17 +1,22 @@
-image: ruby:2.3
+stages:
+  - rspec 
 
 before_script:
-  bundle
+  - bundle
 
-pages:
-  script:
-  - bundle exec yardoc --plugin yard-thor -o public - templates/.* templates/* 
-  artifacts:
-    paths:
-    - public
-  only:
-  - master 
+# pages:
+#   script:
+#   - bundle exec yardoc --plugin yard-thor -o public - templates/.* templates/* 
+#   artifacts:
+#     paths:
+#     - public
+#   only:
+#   - master 
 
-test:
+rspec:
+  stage: rspec
+  image: ruby:2.3
   script:
-    bundle exec rake
+    - bundle exec rspec
+  tags:
+    - docker

data/README.md

@@ -4,6 +4,13 @@
 
 Stack Car is an opinionated set of tools around Docker and Rails.  It provides convenent methods to start and stop docker-compose, to deploy with rancher and a set of templates to get a new Rails app in to docker as quickly as possible.
 
+## Table of Contents
+
+- [Installation](#installation)
+- [Usage](#usage)
+- [Development](#development)
+- [Dockerizing an Application](#dockerizing-an-application)
+- [Generating a Helm Chart](#generating-a-helm-chart)
 
 ## Installation
 
@@ -19,14 +26,14 @@ Commands are accesible via the "sc" short cut. Note: this will need to be in you
 
 ```ruby
 Commands:
-  stack_car bundle_exec ARGS  # wraps docker-compose exec web bundle exec unless --service is used to specify (sc be ARGS)
+  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
+  stack_car exec ARGS         # wraps docker compose exec web unless --service is used to specify
   stack_car help [COMMAND]    # Describe available commands or one specific command
-  stack_car stop              # starts docker-compose with rebuild and orphan removal, defaults to all
-  stack_car up                # starts docker-compose with rebuild and orphan removal, defaults to web
-  stack_car walk ARGS         # wraps docker-compose run web unless --service is used to specify
+  stack_car stop              # starts docker compose with rebuild and orphan removal, defaults to all
+  stack_car up                # starts docker compose with rebuild and orphan removal, defaults to web
+  stack_car walk ARGS         # wraps docker compose run web unless --service is used to specify
 ```
 
 ## Development
@@ -50,10 +57,78 @@ Developing stack_car often requires a rails application for you to run updated c
 - Commit your changes
 
 ### Releasing a new version
-- Update the version number in `version.rb`
+**NOTE:** You will need an account for [rubygems.org](https://rubygems.org) and be made an owner of the [stack_car gem](https://rubygems.org/gems/stack_car) in order to release a new version.
+
+- Update the version number in `version.rb`. Please follow [Semantic Versioning](https://semver.org/) guidelines.
+- Commit `version.rb` and create an MR. Once the MR is approved and merged, checkout the `main` branch and do a `git pull`.
 - Run `bundle exec rake release`
   - This will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Dockerizing an application
+
+Dockerizing your application with stack_car can be thought of in 2 steps:
+- **Generate the file templates**
+- **Customize provided templates to the requirements of the application**
+
+**Set MERGE tool**
+When using stack_car to dockerize an app, it might be necessary to merge templates as opposed to completely overwriting them. To set a tool run:
+```bash
+export THOR_MERGE=<editor>
+```
+Alternatively, set it in your shell's `rc` file (`~/.bashrc`, `~/.zshrc`, etc.)
+
+With `THOR_MERGE` set, you can enter `m` at the command prompt when there is a conflict between app and `sc` template files.
+
+*Note*: For best experience, set `THOR_MERGE` to **GUI text editor** (ie. `code` or `atom`). 
+
+Initiating a merge pulls 2 versions of the file to the editor. One is what is proposed by stack_car, the other is the original. **Add what you need from the template version to the original file and save the changes**.
+
+### Generate templates (`sc dockerize`)
+You can generate requisite files for running your application for local development in Docker with the **dockerize** command.
+
+To **dockerize** your application:
+- `cd` into your project dir
+- Run `sc dockerize` to generate files, appending **service flags** to scaffold any other services your application requires
+  - **For example**:
+    - For rails/postgres: `sc dockerize --postgres`
+    - For rails/mysql/redis: `sc dockerize --mysql --redis`
+
+This command will provide:
+- `Dockerfile`
+- `docker-compose.yml`
+- `.env*` files
+-  **ops** files to get you set up for running your application with **nginx**.
+
+### Customize templates
+
+stack_car will have provided sensible defaults for your services but customization will be required per needs of each project (ie api tokens and email configuration where applicable).
+
+**Customization workflow**
+- Do a text search to find and replace any instances `CHANGEME` in the generated files
+- Add any **general environment variables** to `.env`
+  - This sets defaults for all docker compose environments
+- Add any **development environment variables** to `.env.development` 
+  - These set up any new values or overrides specific to your development env
+- Run `sc build` to build your image
+  - On failed build, browse the terminal output to track down and squash any misconfigurations. Rebuild
+- Upon successful build, run `sc up` to spin up project
+  - If you get errors, browse the terminal output to track down and squash any misconfigurations (refer to the Docker dashboard to see separate logs for each service)
+- Visit site at `localhost:3000`
+  - Alternatively, visit it at the host you have specified to work with **Dory**
+- **Note**: *Depending on the DB required by your application, you will need to create the DB. You need to do that within from the container:*
+  - Using the `bundle-exec` command: `sc bundle-exec db:create`
+  - Shelling in and running in the container shell:
+  ```bash
+      sc exec bash
+      bundle exec rails db:create
+  ```
+
+Once all services are running and speaking to each other you are good to go.
+
+**Tips**:
+- Any changes to `Dockerfile` will require `sc build` for the changes to manifest
+- Changes to `docker-compose.yml` **do not require rebuild unless you have changed the image**
+
 ## Generating a Helm Chart
 
 stack_car's **dockerize** command can be used in conjunction with available flags to generate a **Helm chart** template for your application. You will need to create the *values* files with necessary configuration values from the *sample-values* provided by stack_car, but the command will effectively give you the baseline Notch8 template (scripts, template files, template helpers, sample values file) for a **Helm base Kubernetes deploy**
@@ -88,15 +163,14 @@ Since values files are likely to contain sensitive information like API keys, th
 
 Example workflow (given values file is already created):
 - Edit values file
-- `chart/bin/encrypt staging <keybase-team-name>`
-  - This command will create `staging-values.yaml.enc`
-- `git add staging-values.yaml.enc`
+- `bin/encrypt-secrets`
+  - This command will create/update `staging-values.yaml.enc`
 - Commit and push
 
 When pulling down a repo or branch, you will need to start by decrypting.
 
 Example:
-- `chart/bin/decrypt staging`
+- `bin/decrypt-secrets`
 
 ## Contributing
 

data/lib/stack_car/cli.rb

@@ -18,17 +18,17 @@ module StackCar
     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
-    desc "up", "starts docker-compose with rebuild and orphan removal, defaults to web"
+    desc "up", "starts docker compose with rebuild and orphan removal, defaults to web"
     def up
       setup
       ensure_development_env
       args = ['--remove-orphans']
       args << '--build' if options[:build]
       if options[:build]
-        run("#{dotenv} docker-compose pull #{options[:service]}")
+        run("#{dotenv} docker compose pull #{options[:service]}")
       end
 
-      run_with_exit("#{dotenv} docker-compose up #{args.join(' ')} #{options[:service]}")
+      run_with_exit("#{dotenv} docker compose up #{args.join(' ')} #{options[:service]}")
     end
 
     method_option :service, default: '', type: :string, aliases: '-s'
@@ -36,75 +36,123 @@ module StackCar
     def stop
       setup
       ensure_development_env
-      run("#{dotenv} docker-compose stop #{options[:service]}")
+      run("#{dotenv} docker compose stop #{options[:service]}")
       run_with_exit("rm -rf tmp/pids/*")
     end
-    map down: :stop
+
+    method_option :volumes, aliases: '-v'
+    method_option :rmi
+    method_option :'remove-orphans'
+    method_option :service, aliases: '-s'
+    method_option :timeout, aliases: '-t'
+    method_option :all, aliases: '-a'
+    method_option :help, aliases: '-h'
+    desc 'down', 'stops and removes containers and networks specific to this project by default, run with -h for more options'
+    def down
+      setup
+      ensure_development_env
+
+      if options[:help]
+        run('docker compose down --help')
+        say 'Additional stack_car options:'
+        say '    -a, --all               Removes all containers, networks, volumes, and'
+        say '                            images created by `up`.'
+        say '    -s, --service           Specify a service defined in the Compose file'
+        say '                            whose containers and volumes should be removed.'
+        exit(0)
+      end
+
+      if options[:service]
+        rm_vol = true if options[:volumes]
+
+        remove_container(options[:service], rm_vol)
+        exit(0)
+      end
+
+      run_conf = 'Running down will stop and remove all of the Docker containers and networks ' \
+                 'defined in the docker-compose.yml file. Continue?'
+      prompt_run_confirmation(run_conf)
+
+      args = []
+      if options[:all]
+        prompt_run_confirmation('--all will remove all containers, volumes, networks, local images, and orphaned containers. Continue?')
+
+        args = %w[--volumes --rmi=local --remove-orphans]
+      else
+        args << '--volumes' if options[:volumes]
+        args << '--rmi=local' if options[:rmi]
+        args << '--remove-orphans' if options[:'remove-orphans']
+        args << '--timeout' if options[:timeout]
+      end
+
+      run("#{dotenv} docker compose down #{args.join(' ')}")
+      run_with_exit('rm -rf tmp/pids/*')
+    end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc "build", "builds specified service, defaults to web"
     def build
       setup
       ensure_development_env
-      run_with_exit("#{dotenv} docker-compose build #{options[:service]}")
+      run_with_exit("#{dotenv} docker compose build #{options[:service]}")
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
-    desc "push ARGS", "wraps docker-compose push web unless --service is used to specify"
+    desc "push ARGS", "wraps docker compose push web unless --service is used to specify"
     def push(*args)
       setup
-      run_with_exit("#{dotenv} docker-compose push #{options[:service]} #{args.join(' ')}")
+      run_with_exit("#{dotenv} docker compose push #{options[:service]} #{args.join(' ')}")
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
-    desc "pull ARGS", "wraps docker-compose pull web unless --service is used to specify"
+    desc "pull ARGS", "wraps docker compose pull web unless --service is used to specify"
     def pull(*args)
       setup
-      run_with_exit("#{dotenv} docker-compose pull #{options[:service]} #{args.join(' ')}")
+      run_with_exit("#{dotenv} docker compose pull #{options[:service]} #{args.join(' ')}")
     end
 
     method_option :service, default: '', type: :string, aliases: '-s'
-    desc "ps ARGS", "wraps docker-compose pull web unless --service is used to specify"
+    desc "ps ARGS", "wraps docker compose pull web unless --service is used to specify"
     def ps(*args)
       setup
-      run_with_exit("#{dotenv} docker-compose ps #{options[:service]} #{args.join(' ')}")
+      run_with_exit("#{dotenv} docker compose ps #{options[:service]} #{args.join(' ')}")
     end
     map status: :ps
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
-    desc "bundle ARGS", "wraps docker-compose run web unless --service is used to specify"
+    desc "bundle ARGS", "wraps docker compose run web unless --service is used to specify"
     def bundle(*args)
       setup
-      run_with_exit("#{dotenv} docker-compose exec #{options[:service]} bundle")
+      run_with_exit("#{dotenv} docker compose exec #{options[:service]} bundle")
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
-    desc "walk ARGS", "wraps docker-compose run web unless --service is used to specify"
+    desc "walk ARGS", "wraps docker compose run web unless --service is used to specify"
     def walk(*args)
       setup
-      run_with_exit("#{dotenv} docker-compose run #{options[:service]} #{args.join(' ')}")
+      run_with_exit("#{dotenv} docker compose run #{options[:service]} #{args.join(' ')}")
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
-    desc "exec ARGS", "wraps docker-compose exec web unless --service is used to specify"
+    desc "exec ARGS", "wraps docker compose exec web unless --service is used to specify"
     def exec(*args)
       setup
-      run_with_exit("#{dotenv} docker-compose exec #{options[:service]} #{args.join(' ')}")
+      run_with_exit("#{dotenv} docker compose exec #{options[:service]} #{args.join(' ')}")
     end
     map ex: :exec
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
-    desc 'sh ARGS', "launch a shell using docker-compose exec, sets tty properly"
+    desc 'sh ARGS', "launch a shell using docker compose exec, sets tty properly"
     def sh(*args)
       setup
-      run_with_exit("#{dotenv} docker-compose exec -e COLUMNS=\"\`tput cols\`\" -e LINES=\"\`tput lines\`\" #{options[:service]} bash #{args.join(' ')}")
+      run_with_exit("#{dotenv} docker compose exec -e COLUMNS=\"\`tput cols\`\" -e LINES=\"\`tput lines\`\" #{options[:service]} bash #{args.join(' ')}")
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
-    desc "bundle_exec ARGS", "wraps docker-compose exec web bundle exec unless --service is used to specify"
+    desc "bundle_exec ARGS", "wraps docker compose exec web bundle exec unless --service is used to specify"
     def bundle_exec(*args)
       setup
-      run_with_exit("#{dotenv} docker-compose exec #{options[:service]} bundle exec #{args.join(' ')}")
+      run_with_exit("#{dotenv} docker compose exec #{options[:service]} bundle exec #{args.join(' ')}")
     end
     map be: :bundle_exec
 
@@ -112,7 +160,7 @@ module StackCar
     desc "console ARGS", "shortcut to start rails console"
     def console(*args)
       setup
-      run_with_exit("#{dotenv} docker-compose exec #{options[:service]} bundle exec rails console #{args.join(' ')}")
+      run_with_exit("#{dotenv} docker compose exec #{options[:service]} bundle exec rails console #{args.join(' ')}")
     end
     map rc: :console
 
@@ -165,17 +213,17 @@ module StackCar
     method_option :elasticsearch, default: false, type: :boolean, aliases: '-e'
     method_option :fcrepo, default: false, type: :boolean, aliases: '-f'
     method_option :helm, default: false, type: :boolean, aliases: '-h'
-    method_option :git, default: true, type: :boolean, aliases: '-g'
+    method_option :git, default: false, type: :boolean, aliases: '-g'
     method_option :heroku, default: false, type: :boolean, aliases: '-h'
-    method_option :hyku, default: false, type: :boolean, aliases: '-u'
+    method_option :hyku, default: false, type: :boolean, aliases: "\--hu"
     method_option :imagemagick, default: false, type: :boolean, aliases: '-i'
-    method_option :memcached, default: false, type: :boolean, aliases: '-mc'
-    method_option :mongodb, default: false, type: :boolean, aliases: '-mg'
+    method_option :memcached, default: false, type: :boolean, aliases: "\--mc"
+    method_option :mongodb, default: false, type: :boolean, aliases: "\--mg"
     method_option :mysql, default: false, type: :boolean, aliases: '-m'
     method_option :postgres, default: false, type: :boolean, aliases: '-p'
-    method_option :rancher, default: false, type: :boolean, aliases: '-dr'
+    method_option :rancher, default: false, type: :boolean, aliases: "\--dr"
     method_option :redis, default: false, type: :boolean, aliases: '-r'
-    method_option :sidekiq, default: false, type: :boolean, aliases: '-sq' # TODO
+    method_option :sidekiq, default: false, type: :boolean, aliases: "\--sk"
     method_option :solr, default: false, type: :boolean, aliases: '-s'
     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'
@@ -191,7 +239,8 @@ module StackCar
       setup
       # Commandline overrides config files
       # options = file_config.merge(options)
-      @project_name = File.basename(File.expand_path(dir))
+      # Sets project name to parent directory name if working with stack_car dir
+      @project_name = @sc_dir ? File.basename(File.expand_path('..')) : File.basename(File.expand_path(dir))
       apt_packages << "libpq-dev postgresql-client" if options[:postgres]
       apt_packages << "mysql-client" if options[:mysql]
       apt_packages << "imagemagick" if options[:imagemagick]
@@ -214,14 +263,25 @@ module StackCar
         post_apt << "cd /opt && unzip fits-1.0.5.zip && chmod +X fits-1.0.5/fits.sh"
       end
 
-     ['.dockerignore', 'Dockerfile', 'Dockerfile.base', 'docker-compose.yml', '.gitlab-ci.yml', '.env'].each do |template_file|
+     ['.dockerignore', 'Dockerfile', 'docker-compose.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")
+     directory('.gitlab', '.gitlab')
      template(".env.development.erb", ".env.development")
      template(".env.erb", ".env.production")
+     template(".sops.yaml.erb", ".sops.yaml")
+     template("decrypt-secrets", "bin/decrypt-secrets")
+     template("encrypt-secrets", "bin/encrypt-secrets")
+     template("database.yml.erb", "config/database.yml")
+     template("development.rb.erb", "config/environments/development.rb")
+     template("production.rb.erb", "config/environments/production.rb")
 
+     if options[:solr]
+      template("solrcloud-upload-configset.sh", "bin/solrcloud-upload-configset.sh")
+      template("solrcloud-assign-configset.sh", "bin/solrcloud-assign-configset.sh")
+     end
+      
      if File.exists?('README.md')
        prepend_to_file "README.md" do
          File.read("#{self.class.source_root}/README.md")
@@ -272,7 +332,7 @@ module StackCar
     protected
     def compose_depends(*excludes)
       @compose_depends = []
-      services = [:postgres, :mysql, :elasticsearch, :solr, :redis, :mongodb, :memcached] - excludes
+      services = [:fcrepo, :postgres, :mysql, :elasticsearch, :sidekiq, :solr, :redis, :mongodb, :memcached] - excludes
       services.each do |service|
         if options[service]
           @compose_depends << "      - #{service}"
@@ -344,10 +404,83 @@ module StackCar
 
     def setup
       if File.exists?('stack_car')
+        @sc_dir = true
         Dir.chdir('stack_car')
         self.destination_root += "/stack_car"
       end
       DotRc.new
     end
+
+    def remove_container(service_name, remove_volumes)
+      container = find_container_by_service(service_name)
+
+      container.map do |id, name|
+        prompt_run_confirmation("Remove #{name} container?")
+
+        if `docker container ls --format "{{.Names}}"`.include?(name)
+          say 'Stopping container...'
+          `docker stop #{id}`
+        end
+
+        say 'Removing container...'
+        `docker container rm #{id}`
+
+        # Ensure container was removed
+        if `docker ps -aqf id=#{id}`.empty?
+          say "  Container #{name} was removed"
+        else
+          say ">>> There was an issue removing container #{name} (#{id})"
+        end
+      end
+
+      remove_volumes_mounted_to_container(@container_volume_names) if remove_volumes
+    end
+
+    def find_container_by_service(service_name)
+      container_id = `docker compose ps -aq #{service_name}`.strip
+
+      if container_id.empty?
+        say "Unable to locate a container for the service '#{service_name}'"
+        say "Try running `docker compose ps #{service_name}` to make sure the container exists"
+        exit(1)
+      end
+
+      get_volume_names_for_container(container_id)
+      container_name = `docker ps -af id=#{container_id} --format "{{.Names}}"`.strip
+
+      { container_id => container_name }
+    end
+
+    def remove_volumes_mounted_to_container(volumes)
+      return if volumes.empty?
+
+      prompt_run_confirmation("\n#{volumes.join("\n")}\nRemove these volume(s)?")
+      volumes.each do |v|
+        say 'Removing volume...'
+        `docker volume rm #{v}`
+
+        if `docker volume ls -q`.include?(v)
+          say ">>> There was an issue removing volume #{v}"
+        else
+          say "  Volume #{v} was removed"
+        end
+      end
+    end
+
+    def get_volume_names_for_container(container_id)
+      @container_volume_names ||= []
+      return @container_volume_names unless @container_volume_names.empty?
+
+      JSON.parse(`docker inspect --format="{{json .Mounts}}" #{container_id}`).map do |mount_info|
+        @container_volume_names << mount_info['Name'] if mount_info['Type'] == 'volume'
+      end
+
+      @container_volume_names
+    end
+
+    def prompt_run_confirmation(question)
+      response = ask(question, limited_to: %w[y n])
+      exit(1) unless response == 'y'
+    end
   end
 end

data/lib/stack_car/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module StackCar
-  VERSION = "0.12.0"
+  VERSION = '0.15.0'
 end

data/stack_car.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "yard"

data/templates/.env.erb

@@ -2,6 +2,20 @@ APP_NAME=<%= @project_name %>
 PASSENGER_APP_ENV=development
 REGISTRY_HOST=registry.gitlab.com
 REGISTRY_URI=/CHANGEME/<%= @project_name %>
+
+# SMTP Mailer variables
+# To enable mailer:
+# - Uncomment and edit SMTP vars
+# - Uncomment SMTP Mailer section in respective config/environments file
+# SMTP_USER_NAME=CHANGEME
+# SMTP_PASSWORD=CHANGEME
+# SMTP_ADDRESS=CHANGEME
+# SMTP_DOMAIN=CHANGEME
+# SMTP_PORT=CHANGEME
+# SMTP_TYPE=CHANGEME
+<% if options[:hyku] %>
+# SETTINGS__MULTITENANCY__ADMIN_HOST=CHANGEME
+<% end %>
 TAG=dev
 <% if options[:postgres] -%>
 DATABASE_NAME=<%= @project_name %>
@@ -27,3 +41,12 @@ ES_URL=http://elasticsearch:9200
 SITE_URI=https://CHANGEME.com
 DEPLOY_HOOK=CHANGEME
 <% end -%>
+<% if options[:solr] -%>
+SOLR_URL=http://admin:admin@solr:8983/solr/<%= @project_name %>-development
+SOLR_ADMIN_PASSWORD=admin
+SOLR_ADMIN_USER=admin
+SOLR_COLLECTION_NAME=<%= @project_name %>-development
+SOLR_CONFIGSET_NAME=<%= @project_name %>
+SOLR_HOST=solr
+SOLR_PORT=8983
+<% end -%>

data/templates/.gitlab/issue_templates/Bug.md

@@ -0,0 +1,46 @@
+ # Summary
+
+A short description of the bug. Use # to link to the parent issue or merge request
+
+# Observed Behavior
+
+The current, bugged behavior.
+
+# Expected Behavior
+
+How it should behave once it's fixed. What "done" looks like.
+
+# Screenshots or Video
+
+Include screenshots or videos that demonstrate the bug
+
+# Other Information
+
+Any other logs, related issues, merge requests, wireframes, documentation, slack conversations or anything else that would help the developer try to find and fix this issue, or provide context.
+
+# Acceptance Criteria
+
+This is what done looks like. A higher level checklist of the goals and functionality after this bug is fixed
+
+* [ ] I see these views
+* [ ] When a user does this, that happens
+
+# Steps to Reproduce / Testing Instructions
+
+How did you trigger this bug? Include links to the page where the error occured, if applicable. 
+
+* [ ]  As a (logged in/admin/etc) User
+* [ ]  With these other conditions
+* [ ]  I did these things
+* [ ]  And observed this behavior
+
+## Further information
+
+Edit in any later issues or merge requests that are conencted to this issue, for future reference
+
+### Implementation suggestions
+
+Are nice, but should probably go in a comment. e.g. gems, unrelated issues that dealt with similar problems, stack overflow links.
+
+/label ~"Needs Rework", ~"Ready for Development"
+<!-- By default, should bugs go to Ready for development, to be on the development board, or be like normal issues and go to the planning board> -->

data/templates/.gitlab/issue_templates/Feature.md

@@ -0,0 +1,41 @@
+# Summary
+
+A short description of the feature
+
+# User Stories
+
+What problem is this feature going to solve? 
+
+# Screenshots or Video
+
+Include any relevant media such as wireframes, screenshots, or videos
+
+# Relationships
+
+Are there any other issues or merge requests that are related to this feature (use # to generate a quick link). In particular, is this part of a larger epic, or does it depend on any other tickets being resolved first? Do you need anything else or are you making any other assumptions for this feature?
+
+# Acceptance Criteria
+
+This is what done looks like. A higher level checklist of the goals and functionality of this feature
+
+* [ ] I see these views
+* [ ] When a user does this, that happens
+  
+# Testing Instructions
+
+Steps to demonstrate this feature is properly working. Include a video, if possible. The How to the Acceptance Criteria's What
+
+* [ ] As a (user/admin)
+* [ ] Go here and do these things
+* [ ] To see this happen
+
+
+## Further information
+
+Edit in any later issues or merge requests that are conencted to this issue, for future reference
+
+### Implimentation Suggestions
+
+Any development details that would be helpful when working on this feature e.g. gems, unrelated issues that dealt with similar problems, stack overflow links.
+
+/label ~Icebox

data/templates/.gitlab/issue_templates/Question.md

@@ -0,0 +1,18 @@
+# Summary
+A short description of the question.
+
+## Who has this information
+Consider using @ to tag them, if they're in this repository
+
+# Additional information
+More details about what needs to be answered
+* [ ] Checkboxes are helpful
+* [ ] To make sure all answers are enumerated
+
+# Other links
+Pictures, videos, links to issues, or anything else that might be helpful to provide context for the question
+
+/label ~"Planning in Progress"
+
+/assign me
+<!-- this might cause inboxes to explode, but presumably the one creating a question ticket would be the one who was taking ownership for it, and would be the one responsible for cleaning it up once the question was answered -->