Merge pull request #41 from MaxxtonGroup/development

Development

Author: steven166

.dockerignore

@@ -1,4 +1,5 @@
 *
 !microdocs-server/dist
+!microdocs-server/package.json
 !microdocs-server/config.yml
 !microdocs-ui/dist

.gitignore

@@ -13,4 +13,9 @@
 
 /microdocs-server/data/reports
 /microdocs-server/data/database
-!/docs/**/dist
+!/docs/**/dist
+/docs/src/bower_components
+/npm-cache/conf/storage
+/npm-cache/local_storage
+/npm-cache/storage
+/microdocs-server/npm-debug.log

.travis.yml

@@ -0,0 +1,9 @@
+FROM node:6
+EXPOSE 3000
+WORKDIR /microdocs/microdocs-server
+RUN npm set registry http://192.168.252.165:4873/
+RUN echo @maxxton:registry=https://npm.maxxton.com > .npmrc
+ADD microdocs-server/config.yml .
+ADD microdocs-server/package.json .
+RUN npm install --prod && npm install nodemon
+CMD ./node_modules/.bin/nodemon --watch dist dist/index.js

Dockerfile.dev

@@ -1,96 +1,42 @@
+def tag = input message: 'Tag', parameters: [string(defaultValue: '', description: 'Tag', name: 'TAG')]
 node {
     stage('Checkout Git'){
-        git url: 'git@github.com:MaxxtonGroup/microdocs.git', branch: 'development'
-        stash name: 'source'
-    }
-    stage('Build microdocs-core'){
-        unstash 'source'
-        dir ('microdocs-core-ts'){
-            sh 'echo  "Installing npm dependencies"'
-            sh 'npm version $TAG'
-            sh 'npm install'
-            sh 'echo "Publishing to private NPM registry"'
-            sh 'npm run prepublish'
-            dir ('dist'){
-                stash name: 'microdocs-core-dist'
-            }
-        }
-    }
-    stage('Publish microdocs-core'){
-        unstash 'microdocs-core-dist'
-        dir ('microdocs-core-ts'){
-            try{
-                sh 'npm unpublish @maxxton/microdocs-core@$TAG'
-            }catch(Exception e){}
-            sh 'npm publish dist'
-        }
-    }
-    stage('Build microdocs-cli'){
-        unstash 'source'
-        dir ('microdocs-cli'){
-            sh 'echo  "Installing npm dependencies"'
-            sh 'npm version $TAG'
-            sh 'npm install --save @maxxton/microdocs-core@$TAG'
-            sh 'npm install'
-            sh 'echo "Publishing to private NPM registry"'
-            sh 'npm run prepublish'
-            dir ('dist'){
-                stash name: 'microdocs-cli-dist'
-            }
-        }
-    }
-    stage('Publish microdocs-cli'){
-        unstash 'microdocs-cli-dist'
-        dir ('microdocs-cli') {
-            try{
-                sh 'npm unpublish @maxxton/microdocs-cli@$TAG'
-            }catch(Exception e){}
-            sh 'npm publish'
-        }
+        git url: 'git@github.com:MaxxtonGroup/microdocs.git', branch: 'master'
     }
     stage('Build microdocs-server'){
-        unstash 'source'
         dir ('microdocs-server'){
-            sh 'echo  "Installing npm dependencies"'
-            sh 'npm version $TAG'
-            sh 'npm install --save @maxxton/microdocs-core@$TAG'
             sh 'npm install'
-            sh 'echo "Publishing to private NPM registry"'
-            sh 'npm run package-distribution'
+            sh 'npm version ' + tag
+            sh 'npm run prepublish'
             sh 'cp .npmrc dist/.npmrc'
             dir ('dist'){
                 sh 'npm install --prod'
-                stash name: 'microdocs-server-dist'
             }
         }
     }
     stage('Build microdocs-ui'){
-        unstash 'source'
         dir ('microdocs-ui'){
-            sh 'echo  "Installing npm dependencies"'
-            sh 'npm version $TAG'
-            sh 'npm install --save @maxxton/microdocs-core@$TAG'
-            sh 'npm install @maxxton/gulp-builder@2.3.3 --save-dev'
             sh 'npm install'
-            sh 'echo "Publishing to private NPM registry"'
-            sh 'npm run package-distribution'
-            dir ('dist'){
-                stash name: 'microdocs-ui-dist'
-            }
+            sh 'npm version ' + tag
+            sh './node_modules/.bin/ng build --prod'
+        }
+    }
+    stage('Build microdocs-ui'){
+        dir ('microdocs-ui'){
+            sh 'npm install'
+            sh 'npm version ' + tag
+            sh 'ng build --prod'
         }
     }
     stage('Build docker image'){
-        unstash 'source'
-        unstash 'microdocs-server-dist'
-        unstash 'microdocs-ui-dist'
-        sh 'bash docker rmi maxxton/microdocs:$TAG || true'
+        sh 'bash docker rmi maxxton/microdocs:' + tag + ' || true'
         sh 'bash docker rmi maxxton/microdocs:latest || true'
-        sh 'docker build --tag=maxxton/microdocs:$TAG --no-cache .'
+        sh 'docker build --tag=maxxton/microdocs:' + tag + ' --no-cache .'
     }
     stage('Public docker image'){
         sh 'docker login --email $DOCKERHUB_EMAIL --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD'
-        sh 'docker push maxxton/microdocs:$TAG'
-        sh 'docker tag maxxton/microdocs:$TAG maxxton/microdocs:latest'
+        sh 'docker push maxxton/microdocs:' + tag;
+        sh 'docker tag maxxton/microdocs:' + tag + ' maxxton/microdocs:latest'
         sh 'docker push maxxton/microdocs:latest'
     }
 }

Jenkinsfile

@@ -0,0 +1,17 @@
+version: '2'
+services:
+  npm-registry:
+    image: verdaccio/verdaccio
+    volumes:
+     - ./npm-cache/conf:/verdaccio/conf
+     - ./npm-cache/storage:/verdaccio/storage
+     - ./npm-cache/local_storage :/verdaccio/local_storage
+    ports:
+     - 4873:4873
+    networks:
+     - 'microdocs-server'
+
+networks:
+  microdocs-server:
+    external:
+      name: 'microdocs-server'

docker-compose-npm-cache.yml

@@ -0,0 +1,22 @@
+version: '2'
+services:
+  microdocs-server:
+    container_name: microdocs-dev
+    image: microdocs:dev
+    build:
+      dockerfile: Dockerfile.dev
+      context: .
+    ports:
+     - 3000:3000
+    volumes:
+     - ./microdocs-server/dist:/microdocs/microdocs-server/dist
+     - ./microdocs-server/data:/microdocs/microdocs-server/data
+     - ./microdocs-ui/dist:/microdocs/microdocs-ui/dist
+     - ../microdocs-core/dist:/microdocs/microdocs-server/dist/node_modules/@maxxton/microdocs-core
+    networks:
+     - 'microdocs-server'
+
+networks:
+  microdocs-server:
+    external:
+      name: 'microdocs-server'

docker-compose.yml

@@ -0,0 +1,3 @@
+{
+  "directory": "src/bower_components"
+}

docs/.bowerrc

@@ -1,5 +1,6 @@
 /* Header */
-#head { background:#2196F3; background-size: cover; min-height:520px; text-align: center; padding-top:240px; color:white; font-family:"Open sans", Helvetica, Arial; font-weight:300; }
+.navbar{box-shadow: rgba(0, 0, 0, 0.117647) 0px 1px 6px 0px, rgba(0, 0, 0, 0.117647) 0px 1px 6px 0px;}
+#head { background:#2196F3; background-size: cover; min-height:420px; text-align: center; padding-top:140px; color:white; font-family:"Open sans", Helvetica, Arial; font-weight:300; }
 #head.secondary { height:100px; min-height: 100px; padding-top:0px; }
 	#head .row { position: relative}
 	#head .row img{ position: absolute; opacity: 0.5; height: 350px;}
@@ -110,7 +111,7 @@ img.pull-left { margin-right: 10px; }
 
 .preview code{
 	color: white;
-	background: #000;
+	background: #263238;
 	padding: 10PX 30px;
 	box-shadow: rgba(0, 0, 0, 0.227451) 0px 3px 10px 0px, rgba(0, 0, 0, 0.156863) 0px 3px 10px 0px;
 
@@ -163,4 +164,14 @@ img.pull-left { margin-right: 10px; }
 		display: inline-block;
 		overflow: auto;
 	}
-}
+}
+
+my-app{
+	display: block;
+}
+
+@media (min-width: 1200px) {
+	.container {
+		width: 100%;
+	}
+}