Merged in 3-0-0/release-prep (pull request #71)

v3: Release Prep Approved-by: Frank Febbraro <[email protected]> Approved-by: Chris Johnson <[email protected]>
phase2 · Jun 5, 2017 · 7b243a2 · 7b243a2
2 parents 4eca4d0 + 39a27ce
commit 7b243a2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -24,7 +24,9 @@ module.exports = Generator.extend({
     if (options['replay']) {
       options = _.assign(options, this.config.getAll());
       // Backwards compatibility for mail handling prompt config.
-      options.mail = options.mailhog ? 'mailhog' : 'none';
+      if (!options.mail) {
+        options.mail = options.mailhog ? 'mailhog' : 'none';
+      }
     }
 
     // Ensure the drupalDistro plugin is loaded for this value when sidestepping
@@ -108,9 +110,6 @@ module.exports = Generator.extend({
       options = _.assign(options, props);
       // The complete distro includes callbacks that break when serialized to a file.
       options.drupalDistro = options.drupalDistro.id;
-      if (options['themeName']) {
-        options.themePath = 'src/themes/' + options.themeName;
-      }
 
       var store = options;
       delete store['env'];

diff --git a/generators/app/templates/README.md b/generators/app/templates/README.md
@@ -18,7 +18,7 @@ and operational management of the application code. A build process downloads an
 
 ### Requirements
 
-* [Node.js](https://nodejs.com) v4 via a [package manager](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager) or [standalone installer](http://nodejs.org/download/)
+* [Node.js](https://nodejs.com) v6 via a [package manager](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager) or [standalone installer](http://nodejs.org/download/)
 * [Grunt](https://gruntjs.org) (`npm install -g grunt-cli`)
 * PHP 5.6
 * [Composer](https://getcomposer.org/download) (e.g. `brew install composer`)

diff --git a/generators/environment/templates/docker/build.yml b/generators/environment/templates/docker/build.yml
@@ -57,7 +57,7 @@ services:
     labels:
       com.dnsdock.name: theme
       com.dnsdock.image: <%= domain %>
-    working_dir: /var/www/src/themes/<%= themeName %>
+    working_dir: /var/www/<%= themePath %>/<%= themeName %>
     entrypoint: [ "/init", "./node_modules/.bin/gulp" ]
     command: ""
   <% } -%>

diff --git a/generators/environment/templates/docs/TODOS.md b/generators/environment/templates/docs/TODOS.md
@@ -7,13 +7,13 @@
     * Gruntconfig.json
     * `env/build/etc/drush/drushrc.php` for drush config and default options you may want to change for the sql-dump command.
 * [ ] Set up the Docker-based site.
-    * Read the [Phase2 DevTools](http://phase2.github.io/devtools/).
+    * Install and start [Outrigger](http://docs.outrigger.sh/).
     * Run  `docker-compose pull && docker-compose -f build.yml pull` to ensure you have the latest Docker images for local development.
     * Run `bash bin/start.sh` to confirm the code works.
     * `npm install` and other tools should only be run inside containers.
 * [ ] Set up Jenkins to manage your CI and build processes.
     * Ensure the Jenkins jobs have the correct Git URL.
-    * Visit the CI Server and [spin up your Jenkins instance](http://build.<%= host.master %>/job/ci-start/parambuild/?delay=0sec&NAME=<%= projectName %>&GIT_URL=git%40bitbucket.org%3Aphase2tech%2F<%= projectName %>.git&GIT_REF=develop).
+    * Visit the CI Server and [spin up your Jenkins instance](http://build.<%= host.devcloud %>/job/ci-start/parambuild/?delay=0sec&NAME=<%= projectName %>&GIT_URL=git%40bitbucket.org%3Aphase2tech%2F<%= projectName %>.git&GIT_REF=develop).
     * Confirm that you **do not need** a dedicated Dev Cloud instance.
 * [ ] Adjust the project to match your project's needs.
     * Do not forget to specify your profile in `Gruntconfig.json`!