fix(gen:docker): move docker submodule, fixe docker FROM version

Author: JeremyMarshall

Diff for: .gitmodules

@@ -1,6 +1,6 @@
 [submodule "angular-fullstack-deps"]
 	path = angular-fullstack-deps
 	url = [email protected]:angular-fullstack/angular-fullstack-deps.git
-[submodule "ci/angular-fullstack-dockerfile"]
-	path = ci/angular-fullstack-dockerfile
+[submodule "angular-fullstack-dockerfile"]
+	path = angular-fullstack-dockerfile
 	url = [email protected]:angular-fullstack/angular-fullstack-dockerfile.git

Diff for: angular-fullstack-dockerfile

@@ -15,18 +15,15 @@ var Generator = module.exports = function Generator() {
 util.inherits(Generator, yeoman.generators.NamedBase);
 
 Generator.prototype.copyDockerfile = function copyDockerfile() {
-  if(this.abort) return;
   var done = this.async();
   this.log(chalk.bold('Creating Dockerfile'));
-  //this.copy('Dockerfile', 'dist/Dockerfile');
-  this.fs.copyTpl(this.templatePath('_Dockerfile'), 'dist/Dockerfile', {});
+  this.fs.copyTpl(this.templatePath('_Dockerfile'), 'dist/Dockerfile', this );
   this.conflicter.resolve(function (err) {
     done();
   });
 };
 
 Generator.prototype.gruntBuild = function gruntBuild() {
-  if(this.abort) return;
   var done = this.async();
 
   this.log(chalk.bold('\nBuilding dist folder, please wait...'));

Diff for: ci/angular-fullstack-dockerfile

@@ -1,2 +1,2 @@
-FROM generatorangularfullstack/angular-fullstack-dist:3.3.0
+FROM generatorangularfullstack/angular-fullstack-dist:<%= rootGeneratorVersion() %>