Merge pull request #34 from MaxxtonGroup/development

Development

Author: steven166

.dockerignore

@@ -11,4 +11,10 @@
 !microdocs-ui/gulpfile.js
 !microdocs-ui/package.json
 !microdocs-ui/typings.json
-!microdocs-ui/.npmrc
+!microdocs-ui/.npmrc
+
+!microdocs-core-ts/src
+!microdocs-core-ts/gulpfile.js
+!microdocs-core-ts/package.json
+!microdocs-core-ts/typings.json
+!microdocs-core-ts/.npmrc

Dockerfile

@@ -1,21 +1,41 @@
 FROM node:6
 
+ARG PROXY_URL
+RUN npm set registry ${PROXY_URL:-https://registry.npmjs.org/}
+
 RUN npm install -g gulp
 
+RUN mkdir -p /microdocs/microdocs-core-ts
 RUN mkdir -p /microdocs/microdocs-server
 RUN mkdir -p /microdocs/microdocs-ui
 
+# Get dependencies for microdocs-core
+WORKDIR /microdocs/microdocs-core-ts
+ADD ./microdocs-core-ts/.npmrc /microdocs/microdocs-core-ts/
+ADD ./microdocs-core-ts/package.json /microdocs/microdocs-core-ts/
+ADD ./microdocs-core-ts/typings.json /microdocs/microdocs-core-ts/
+RUN npm install
+
+# Build microdocs-core
+ADD ./microdocs-core-ts /microdocs/microdocs-core-ts
+RUN npm run prepublish
+WORKDIR /microdocs/microdocs-core-ts/dist
+RUN npm link
+
 # Get dependencies for microdocs-ui
 WORKDIR /microdocs/microdocs-ui
 ADD ./microdocs-ui/.npmrc /microdocs/microdocs-ui/
 ADD ./microdocs-ui/package.json /microdocs/microdocs-ui/
-RUN npm install
+ADD ./microdocs-ui/typings.json /microdocs/microdocs-ui/
+RUN npm link @maxxton/microdocs-core && npm install
 
 # Get dependencies for microdocs-server
 WORKDIR /microdocs/microdocs-server
 ADD ./microdocs-server/.npmrc /microdocs/microdocs-server/
 ADD ./microdocs-server/package.json /microdocs/microdocs-server/
-RUN npm install
+ADD ./microdocs-server/typings.json /microdocs/microdocs-server/
+RUN npm link @maxxton/microdocs-core && npm install
+RUN /microdocs/microdocs-server/node_modules/.bin/typings install
 
 # Build microdocs-ui
 WORKDIR /microdocs/microdocs-ui

example/customer-service/build.gradle

@@ -56,6 +56,7 @@ checkMicroDocs {
 }
 publishMicroDocs {
 	env = 'development'
+	groupName = 'services'
 	url = 'http://localhost:3000'
 	failOnProblems = false;
 }

microdocs-core-java/build.gradle

@@ -1,5 +1,5 @@
 group 'com.maxxton'
-version '1.5'
+version '1.6.0'
 
 apply plugin: 'java'
 apply plugin: 'maven'
@@ -41,10 +41,10 @@ uploadArchives {
         mavenDeployer {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-//            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-//                authentication(userName: sonatypeUsername, password: sonatypePassword)
-//            }
-            repository(url: mavenLocal().url)
+            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                authentication(userName: sonatypeUsername, password: sonatypePassword)
+            }
+//            repository(url: mavenLocal().url)
 
             pom.project {
                 name 'MicroDocs Core Java'

microdocs-core-ts/.npmrc

@@ -1 +1,2 @@
-@maxxton:registry=https://npm.maxxton.com
+@maxxton:registry=https://npm.maxxton.com
+@types:registry= https://registry.npmjs.org/

microdocs-core-ts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maxxton/microdocs-core",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Shared code for the microdocs-server and microdocs-ui",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@maxxton/gulp-builder": "1.3.16",
+    "@maxxton/gulp-builder": "1.5.13",
     "chai": "^3.5.0",
     "gulp": ">=3.9.1"
   }

microdocs-core-ts/src/domain/dependency/dependency.model.ts

@@ -19,5 +19,6 @@ export interface Dependency {
   paths?:{[path:string]:{[method:string]:Path}};
   component?:Component;
   problems?:Array<Problem>;
+  inherit?:boolean;
 
 }

microdocs-core-ts/src/domain/deploy/deploy-build.model.ts

@@ -0,0 +1,6 @@
+
+export interface DeployBuild{
+  context?:string;
+  dockerfile?:string;
+  args?:string[];
+}

microdocs-core-ts/src/domain/deploy/deploy.model.ts

@@ -0,0 +1,10 @@
+
+import { DeployBuild } from "./deploy-build.model";
+export interface Deploy{
+  containerName?:string;
+  image?:string;
+  exposePorts?:string[];
+  alias?:string;
+  build?:DeployBuild;
+  environment?:string[];
+}

microdocs-core-ts/src/domain/index.ts

@@ -35,6 +35,7 @@ export { Node } from './tree/node.model';
 export { ProjectNode } from './tree/project-node.model';
 export { ProjectTree } from './tree/project-tree.model';
 export { DependencyNode } from './tree/dependency-node.model';
+export { FlatList } from './tree/flat-list.model';
 
 export { ProjectSettings, Environments } from './settings/project-settings.model';
 export { ProjectChangeRule } from './settings/project-change-rule.model';