From 4ca302317a775fa44af7484c5e2a8a30b3fb5313 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 27 Oct 2015 14:12:25 -0700 Subject: [PATCH 001/102] Update distelli-manifest.yml --- distelli-manifest.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 7d45f4f..ae6ffe2 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -24,8 +24,8 @@ bmcghee/example-node: - sudo apt-get -y update - echo "-Installing nodejs-" - sudo apt-get -y install nodejs - - echo "-Installing npm-" - - sudo apt-get -y install npm + #- echo "-Installing npm-" + #- sudo apt-get -y install npm InstallTemplates: - "views/index.jade" @@ -38,11 +38,10 @@ bmcghee/example-node: - sed -i "s|My Application|$NR_APP_NAME|g" newrelic.js Env: - - PORT: "4000" - DISTELLI_INSTALLVIEW="templates/notset.json" - NR_INSTALL_SILENT: "TRUE" - - NR_APP_NAME: "NodeJS App" - - NR_INSTALL_KEY: "fc297ee8baef8312725cc134642ab4fce85a7666" + - NR_APP_NAME: "SET_THIS_IN_DISTELLI" + - NR_INSTALL_KEY: "SET_THIS_IN_DISTELLI" - PORT: "8000" Exec: From 2e6b5fbca109598e9cb2bac48cb119d06414420e Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 27 Oct 2015 17:20:44 -0700 Subject: [PATCH 002/102] Update distelli-manifest.yml --- distelli-manifest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index ae6ffe2..c0ef931 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -46,3 +46,4 @@ bmcghee/example-node: Exec: - /usr/bin/nodejs app.js + From e6c1829a05839961723c1ffd850847db42917650 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 27 Oct 2015 17:22:20 -0700 Subject: [PATCH 003/102] trigger From bd3a094877c4a7a524da80f2b5c7e9077e334c4a Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 27 Oct 2015 17:22:52 -0700 Subject: [PATCH 004/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index c0ef931..25babc8 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcghee/example-node: +bmcgehee/example-node: # Distelli Manifest example # this example assumes the build and deploy servers are: # Ubuntu 14.04 From d418758d7d7765b119afd05c0bf3ccebdc85d81e Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 27 Oct 2015 17:24:28 -0700 Subject: [PATCH 005/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 25babc8..ae3a4e7 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -38,7 +38,7 @@ bmcgehee/example-node: - sed -i "s|My Application|$NR_APP_NAME|g" newrelic.js Env: - - DISTELLI_INSTALLVIEW="templates/notset.json" + - DISTELLI_INSTALLVIEW: "templates/notset.json" - NR_INSTALL_SILENT: "TRUE" - NR_APP_NAME: "SET_THIS_IN_DISTELLI" - NR_INSTALL_KEY: "SET_THIS_IN_DISTELLI" From dcaf0d10518388fcc74645d8a78252916811b488 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 27 Oct 2015 17:27:51 -0700 Subject: [PATCH 006/102] move newrelic up --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34f0130..673c1b0 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,12 @@ }, "homepage": "https://github.com/alexleventer/NodeExpress", "dependencies": { + "newrelic": "^1.20.0" "body-parser": "^1.13.2", "express": "^4.13.1", "grunt": "^0.4.5", "jade": "^1.10.0", "nodemon": "^1.3.8", "path": "^0.11.14", - "newrelic": "^1.20.0" } } From c8a2b5d68dd1767ff49c34c622793127f38a41f5 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 27 Oct 2015 17:28:43 -0700 Subject: [PATCH 007/102] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 673c1b0..e3e38b1 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,12 @@ }, "homepage": "https://github.com/alexleventer/NodeExpress", "dependencies": { - "newrelic": "^1.20.0" + "newrelic": "^1.20.0", "body-parser": "^1.13.2", "express": "^4.13.1", "grunt": "^0.4.5", "jade": "^1.10.0", "nodemon": "^1.3.8", - "path": "^0.11.14", + "path": "^0.11.14" } } From 810b6ffddf644452c022d28343e5904c8af882cc Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 27 Oct 2015 17:32:49 -0700 Subject: [PATCH 008/102] Update distelli-manifest.yml From f11fbe43041d72b960237bc3e5467db344557d13 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 28 Oct 2015 12:30:43 -0700 Subject: [PATCH 009/102] Update app.js --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index 921696e..562346f 100644 --- a/app.js +++ b/app.js @@ -1,8 +1,8 @@ +var newRelic = require('newrelic'); var express = require('express'); var app = express(); var path = require('path'); var bodyParser = require('body-parser'); -var newRelic = require('newrelic'); var timeController = require('./controllers/time'); var homeController = require('./controllers/home'); From 74443e87acbd345b298beff52fb712bf5c330fe5 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 28 Oct 2015 13:16:46 -0700 Subject: [PATCH 010/102] update manifest --- distelli-manifest.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index ae3a4e7..2e6c7e8 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,41 +1,38 @@ bmcgehee/example-node: # Distelli Manifest example - # this example assumes the build and deploy servers are: - # Ubuntu 14.04 Build: - echo "---Building---" - set +e; source /etc/profile; set -e - nvm install v4.2.1 - npm install + - cp node_modules/newrelic/newrelic.js . + - sed -i "s|license key here|$NR_INSTALL_KEY|g" newrelic.js + - sed -i "s|My Application|$NR_APP_NAME|g" newrelic.js - echo "--Testing--" - npm test PkgInclude: - '*' - #PkgExclude: - #- node_modules/ - PreInstall: - echo "---Begining PreInstall---" - echo "--Installing deploy dependencies--" - echo "-Updating apt-get-" - sudo apt-get -y update + - echo "-Installing nvm pre-requisites-" + - sudo apt-get -y install build-essential libssl-dev curl + - echo "-Installing nvm-" + - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.26.0/install.sh | bash + - set +e; source ~/.nvm/nvm.sh; set -e - echo "-Installing nodejs-" - - sudo apt-get -y install nodejs - #- echo "-Installing npm-" - #- sudo apt-get -y install npm + - nvm install v4.2.1 InstallTemplates: - "views/index.jade" PostInstall: - echo "Begin PostInstall" - #- npm install - - cp node_modules/newrelic/newrelic.js . - - sed -i "s|license key here|$NR_INSTALL_KEY|g" newrelic.js - - sed -i "s|My Application|$NR_APP_NAME|g" newrelic.js Env: - DISTELLI_INSTALLVIEW: "templates/notset.json" @@ -45,5 +42,6 @@ bmcgehee/example-node: - PORT: "8000" Exec: - - /usr/bin/nodejs app.js + - set +e; source ~/.nvm/nvm.sh; set -e + - nodejs app.js From 8deb9d6cde53c32d1dc06e892e4eb016a995eb3a Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 28 Oct 2015 17:30:10 -0700 Subject: [PATCH 011/102] manifest updates --- distelli-manifest.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 2e6c7e8..039936b 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,10 +1,13 @@ bmcgehee/example-node: # Distelli Manifest example - Build: - - echo "---Building---" + PreBuild: + - echo "---Preparing for Build---" - set +e; source /etc/profile; set -e - nvm install v4.2.1 + + Build: + - echo "---Building---" - npm install - cp node_modules/newrelic/newrelic.js . - sed -i "s|license key here|$NR_INSTALL_KEY|g" newrelic.js @@ -43,5 +46,6 @@ bmcgehee/example-node: Exec: - set +e; source ~/.nvm/nvm.sh; set -e - - nodejs app.js + - nvm use v4.2.1 + - node app.js From 76e4ef48675a4f21dc2695bba6c98d1e31a0bb91 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 28 Oct 2015 17:40:59 -0700 Subject: [PATCH 012/102] update --- distelli-manifest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 039936b..1626415 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -49,3 +49,4 @@ bmcgehee/example-node: - nvm use v4.2.1 - node app.js + From 0df8dd1f65a8f10e9898259006551dfa8e1b5707 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 28 Oct 2015 18:09:07 -0700 Subject: [PATCH 013/102] test --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 1626415..f4049ee 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -49,4 +49,4 @@ bmcgehee/example-node: - nvm use v4.2.1 - node app.js - + From 34786639054c21f48f95c98c0a0f14b6530fb02a Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 30 Oct 2015 11:32:35 -0700 Subject: [PATCH 014/102] Trigger checkin --- distelli-manifest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index f4049ee..4a1e38f 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -50,3 +50,4 @@ bmcgehee/example-node: - node app.js + From cd2c7f1836ee33420110e1ee19abf9603d5c497d Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 12 Nov 2015 13:15:20 -0800 Subject: [PATCH 015/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 4a1e38f..7469588 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgehee/example-node: +bmcgehee/example-node2: # Distelli Manifest example PreBuild: From 14993311890daaae3beb08c646691000bd1b6f5b Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 12 Nov 2015 13:19:24 -0800 Subject: [PATCH 016/102] trigger build --- distelli-manifest.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 7469588..32fb7f3 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -49,5 +49,3 @@ bmcgehee/example-node2: - nvm use v4.2.1 - node app.js - - From 27cbf445b944cc5b08dbc1d6573d6057088c06e2 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 16 Nov 2015 16:48:47 -0800 Subject: [PATCH 017/102] Trigger --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 32fb7f3..039936b 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgehee/example-node2: +bmcgehee/example-node: # Distelli Manifest example PreBuild: From 418aba5955871a4515ff63935915a09a7c399e4a Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 20 Nov 2015 17:04:42 -0800 Subject: [PATCH 018/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 039936b..522280e 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgehee/example-node: +bmcgehee2/example-node: # Distelli Manifest example PreBuild: From 8b8a92f93c117bb92af072f50b85530ac147e296 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 7 Dec 2015 15:41:22 -0800 Subject: [PATCH 019/102] Update distelli-manifest.yml --- distelli-manifest.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 522280e..92fece0 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -7,6 +7,9 @@ bmcgehee2/example-node: - nvm install v4.2.1 Build: + - echo "---NVM Use---" + - set +e; source ~/.nvm/nvm.sh; set -e + - nvm use v4.2.1 - echo "---Building---" - npm install - cp node_modules/newrelic/newrelic.js . From 6ebd2650fbeb45599056bbbacb83aaf66772714b Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 14 Dec 2015 10:33:49 -0800 Subject: [PATCH 020/102] Trigger a build/deploy --- distelli-manifest.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 92fece0..26ade9f 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -52,3 +52,6 @@ bmcgehee2/example-node: - nvm use v4.2.1 - node app.js + + + From d608e37bd7bcc60000fd027131037027e27846ad Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 15 Dec 2015 13:13:37 -0800 Subject: [PATCH 021/102] remark out newrelic --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index 562346f..cab43f4 100644 --- a/app.js +++ b/app.js @@ -1,4 +1,4 @@ -var newRelic = require('newrelic'); +#var newRelic = require('newrelic'); var express = require('express'); var app = express(); var path = require('path'); From 2f0c9748747bad5b96ed0e55e3c8d707a09f3ae2 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 15 Dec 2015 13:16:07 -0800 Subject: [PATCH 022/102] Fix bad remark --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index cab43f4..4371b9a 100644 --- a/app.js +++ b/app.js @@ -1,4 +1,4 @@ -#var newRelic = require('newrelic'); +//var newRelic = require('newrelic'); var express = require('express'); var app = express(); var path = require('path'); From e9e40287fcd6b6b36212ce9dae130de842baa6ab Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 17 Dec 2015 09:25:58 -0800 Subject: [PATCH 023/102] simplify manifest --- app.js | 1 - distelli-manifest.yml | 38 +++++--------------------- old_distelli-manifest.yml | 57 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 33 deletions(-) create mode 100644 old_distelli-manifest.yml diff --git a/app.js b/app.js index 4371b9a..6d01680 100644 --- a/app.js +++ b/app.js @@ -1,4 +1,3 @@ -//var newRelic = require('newrelic'); var express = require('express'); var app = express(); var path = require('path'); diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 26ade9f..9c92d06 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,20 +1,11 @@ bmcgehee2/example-node: # Distelli Manifest example - PreBuild: - - echo "---Preparing for Build---" - - set +e; source /etc/profile; set -e - - nvm install v4.2.1 + Build: - - echo "---NVM Use---" - - set +e; source ~/.nvm/nvm.sh; set -e - - nvm use v4.2.1 - echo "---Building---" - npm install - - cp node_modules/newrelic/newrelic.js . - - sed -i "s|license key here|$NR_INSTALL_KEY|g" newrelic.js - - sed -i "s|My Application|$NR_APP_NAME|g" newrelic.js - echo "--Testing--" - npm test @@ -26,32 +17,15 @@ bmcgehee2/example-node: - echo "--Installing deploy dependencies--" - echo "-Updating apt-get-" - sudo apt-get -y update - - echo "-Installing nvm pre-requisites-" - - sudo apt-get -y install build-essential libssl-dev curl - - echo "-Installing nvm-" - - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.26.0/install.sh | bash - - set +e; source ~/.nvm/nvm.sh; set -e - - echo "-Installing nodejs-" - - nvm install v4.2.1 - - InstallTemplates: - - "views/index.jade" + - echo "-Installing nodejs-"" + - sudo apt-get -y nodejs PostInstall: - echo "Begin PostInstall" Env: - - DISTELLI_INSTALLVIEW: "templates/notset.json" - - NR_INSTALL_SILENT: "TRUE" - - NR_APP_NAME: "SET_THIS_IN_DISTELLI" - - NR_INSTALL_KEY: "SET_THIS_IN_DISTELLI" - - PORT: "8000" - + - PORT: "3000" + Exec: - - set +e; source ~/.nvm/nvm.sh; set -e - - nvm use v4.2.1 - node app.js - - - - + diff --git a/old_distelli-manifest.yml b/old_distelli-manifest.yml new file mode 100644 index 0000000..26ade9f --- /dev/null +++ b/old_distelli-manifest.yml @@ -0,0 +1,57 @@ +bmcgehee2/example-node: + # Distelli Manifest example + + PreBuild: + - echo "---Preparing for Build---" + - set +e; source /etc/profile; set -e + - nvm install v4.2.1 + + Build: + - echo "---NVM Use---" + - set +e; source ~/.nvm/nvm.sh; set -e + - nvm use v4.2.1 + - echo "---Building---" + - npm install + - cp node_modules/newrelic/newrelic.js . + - sed -i "s|license key here|$NR_INSTALL_KEY|g" newrelic.js + - sed -i "s|My Application|$NR_APP_NAME|g" newrelic.js + - echo "--Testing--" + - npm test + + PkgInclude: + - '*' + + PreInstall: + - echo "---Begining PreInstall---" + - echo "--Installing deploy dependencies--" + - echo "-Updating apt-get-" + - sudo apt-get -y update + - echo "-Installing nvm pre-requisites-" + - sudo apt-get -y install build-essential libssl-dev curl + - echo "-Installing nvm-" + - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.26.0/install.sh | bash + - set +e; source ~/.nvm/nvm.sh; set -e + - echo "-Installing nodejs-" + - nvm install v4.2.1 + + InstallTemplates: + - "views/index.jade" + + PostInstall: + - echo "Begin PostInstall" + + Env: + - DISTELLI_INSTALLVIEW: "templates/notset.json" + - NR_INSTALL_SILENT: "TRUE" + - NR_APP_NAME: "SET_THIS_IN_DISTELLI" + - NR_INSTALL_KEY: "SET_THIS_IN_DISTELLI" + - PORT: "8000" + + Exec: + - set +e; source ~/.nvm/nvm.sh; set -e + - nvm use v4.2.1 + - node app.js + + + + From 9d258788d6f52cdbad5e57333419b6c67cf5ca15 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 17 Dec 2015 09:26:18 -0800 Subject: [PATCH 024/102] simplify manifest --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 9c92d06..dfe8bc3 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgehee2/example-node: +bmcgehee/example-node: # Distelli Manifest example From 67adb601bb36e606636e9704a68a939800224ad5 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 17 Dec 2015 09:31:08 -0800 Subject: [PATCH 025/102] simplify manifest --- distelli-manifest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index dfe8bc3..08c0702 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -17,8 +17,8 @@ bmcgehee/example-node: - echo "--Installing deploy dependencies--" - echo "-Updating apt-get-" - sudo apt-get -y update - - echo "-Installing nodejs-"" - - sudo apt-get -y nodejs + - echo "-Installing nodejs-" + - sudo apt-get -y install nodejs PostInstall: - echo "Begin PostInstall" From cda2a906d26a8866066c007779bda476696820a5 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 17 Dec 2015 09:31:59 -0800 Subject: [PATCH 026/102] simplify manifest --- distelli-manifest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 08c0702..61153a4 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -2,7 +2,6 @@ bmcgehee/example-node: # Distelli Manifest example - Build: - echo "---Building---" - npm install From 128aba2705fd8d07159e712fb022db0c7135f44a Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 17 Dec 2015 09:34:10 -0800 Subject: [PATCH 027/102] simplify manifest --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 61153a4..fd3cf8d 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -26,5 +26,5 @@ bmcgehee/example-node: - PORT: "3000" Exec: - - node app.js + - nodejs app.js From 93889396646b370603a364f7b4fabebd36a90e8c Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 17 Dec 2015 09:37:50 -0800 Subject: [PATCH 028/102] simplify manifest --- views/index.jade | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/views/index.jade b/views/index.jade index 3ba6433..0bb9313 100644 --- a/views/index.jade +++ b/views/index.jade @@ -7,11 +7,9 @@ html link(rel='stylesheet', href='./style.css') body #message - {{#display_msg}} -

Running in the {{this_env}} environment

- {{/display_msg}} +
#container - h1 Just a Simple Node + Express App + h1 Just a Simple Node + Express App from Distelli! h1 #{date} a(href="https://www.distelli.com" target="_blank") Built and Deployed by Distelli From 30730e401761847ac46ddadf24fee97c07f85b89 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 17 Dec 2015 09:44:34 -0800 Subject: [PATCH 029/102] update README.md --- README.md | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 59fc2a0..5a7a46e 100644 --- a/README.md +++ b/README.md @@ -77,30 +77,15 @@ For example if your username is 'YourUserName' your `distelli-manifest.yml` shou ``` YourUserName/nodejsbuilddeploy: - # Distelli Manifest example - # this example assumes the build and deploy servers are: - # Ubuntu 14.04 - - PreRelease: - - echo "---Beginning PreRelease---" - - echo "--Installing build dependencies--" - - echo "-Updating apt-get-" - - sudo apt-get -y update - - echo "-Installing nodejs-" - - sudo apt-get -y install nodejs - - echo "-Installing npm-" - - sudo apt-get -y install npm - - echo "--Building--" - - sudo npm install + Build: + - echo "---Building---" + - npm install - echo "--Testing--" - npm test PkgInclude: - '*' - PkgExclude: - - node_modules/ - PreInstall: - echo "---Begining PreInstall---" - echo "--Installing deploy dependencies--" @@ -108,18 +93,15 @@ YourUserName/nodejsbuilddeploy: - sudo apt-get -y update - echo "-Installing nodejs-" - sudo apt-get -y install nodejs - - echo "-Installing npm-" - - sudo apt-get -y install npm PostInstall: - echo "Begin PostInstall" - - npm install - + Env: - - PORT: 3000 - + - PORT: "3000" + Exec: - - /usr/bin/nodejs app.js + - nodejs app.js ``` **Save your change.** From 37445ad30dd0401f9b2116639255bbff407cdef2 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 17 Dec 2015 10:16:54 -0800 Subject: [PATCH 030/102] Trigger a build 12/17 --- distelli-manifest.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index fd3cf8d..e6ed740 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -27,4 +27,7 @@ bmcgehee/example-node: Exec: - nodejs app.js + + + From 4644efaf4b864ad41a7a53ce69038816cb138106 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 23 Dec 2015 11:44:14 -0800 Subject: [PATCH 031/102] Create Dockerfile --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..d8ee39a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,6 @@ +FROM ubuntu:14.04 +RUN apt-get update -y +RUN sudo apt-get -y install nodejs +COPY . /src +EXPOSE 3000 +CMD ["nodejs", "/src/app.js"] From 38e77c255e2648114d9a494e623f3234332304a2 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 18 Jan 2016 12:34:03 -0800 Subject: [PATCH 032/102] Update distelli-manifest.yml --- distelli-manifest.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index e6ed740..80352fa 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,6 +1,12 @@ bmcgehee/example-node: # Distelli Manifest example + + Env: + - PORT: "3000" + PreBuild: + - echo "---PreBuild---" + #- Add any build pre-requisites here Build: - echo "---Building---" @@ -12,7 +18,7 @@ bmcgehee/example-node: - '*' PreInstall: - - echo "---Begining PreInstall---" + - echo "---PreInstall---" - echo "--Installing deploy dependencies--" - echo "-Updating apt-get-" - sudo apt-get -y update @@ -20,10 +26,7 @@ bmcgehee/example-node: - sudo apt-get -y install nodejs PostInstall: - - echo "Begin PostInstall" - - Env: - - PORT: "3000" + - echo "---PostInstall---" Exec: - nodejs app.js From ed21b78343363f2edd15dc815071b39b46add49c Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 18 Jan 2016 12:40:02 -0800 Subject: [PATCH 033/102] Update distelli-manifest.yml --- distelli-manifest.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 80352fa..992aee6 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,14 +1,12 @@ bmcgehee/example-node: # Distelli Manifest example - Env: - - PORT: "3000" - PreBuild: + # Add any build pre-requisites here - echo "---PreBuild---" - #- Add any build pre-requisites here Build: + # Enter your build steps here! - echo "---Building---" - npm install - echo "--Testing--" @@ -17,7 +15,15 @@ bmcgehee/example-node: PkgInclude: - '*' + ###Below is deployment phases + + Env: + # Set any environment variables in this section. + # These are available during all phases of a deploy. + - PORT: "3000" + PreInstall: + # Use this section to install any deployment pre-requisites. - echo "---PreInstall---" - echo "--Installing deploy dependencies--" - echo "-Updating apt-get-" @@ -31,6 +37,4 @@ bmcgehee/example-node: Exec: - nodejs app.js - - - + From 8b2031610934301b32af4c4213e87e13e1333f61 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 18 Jan 2016 13:03:06 -0800 Subject: [PATCH 034/102] Update distelli-manifest.yml --- distelli-manifest.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 992aee6..aa10c2f 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -11,6 +11,11 @@ bmcgehee/example-node: - npm install - echo "--Testing--" - npm test + - docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + - docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" + - docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + - docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + PkgInclude: - '*' @@ -25,6 +30,7 @@ bmcgehee/example-node: PreInstall: # Use this section to install any deployment pre-requisites. - echo "---PreInstall---" + - sudo docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" - echo "--Installing deploy dependencies--" - echo "-Updating apt-get-" - sudo apt-get -y update @@ -35,6 +41,7 @@ bmcgehee/example-node: - echo "---PostInstall---" Exec: - - nodejs app.js + #- nodejs app.js + - sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" From 080efe2d4794ffcd93c347ce2e044e639afeaf27 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 18 Jan 2016 13:25:44 -0800 Subject: [PATCH 035/102] trigger build --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index aa10c2f..d725f47 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -15,7 +15,7 @@ bmcgehee/example-node: - docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" - docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - + PkgInclude: - '*' From 781db8e8ed6d90bf674b127e57293128a0bc1aa2 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 18 Jan 2016 13:59:42 -0800 Subject: [PATCH 036/102] Remark docker commands. --- distelli-manifest.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index d725f47..df5fd8a 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -11,10 +11,10 @@ bmcgehee/example-node: - npm install - echo "--Testing--" - npm test - - docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" - - docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" - - docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - - docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + #- docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + #- docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" + #- docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + #- docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" PkgInclude: @@ -30,7 +30,7 @@ bmcgehee/example-node: PreInstall: # Use this section to install any deployment pre-requisites. - echo "---PreInstall---" - - sudo docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + #- sudo docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" - echo "--Installing deploy dependencies--" - echo "-Updating apt-get-" - sudo apt-get -y update @@ -41,7 +41,7 @@ bmcgehee/example-node: - echo "---PostInstall---" Exec: - #- nodejs app.js - - sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + - nodejs app.js + #- sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" From ba725bc65468365b8a2148ae8efd67f92e00e752 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 20 Jan 2016 11:23:59 -0800 Subject: [PATCH 037/102] fix name --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index df5fd8a..0631acd 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgehee/example-node: +bmcgehee/example-node-demo1: # Distelli Manifest example PreBuild: From 016ae367ec88736c643331da6812c591d64be9fd Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 20 Jan 2016 11:32:24 -0800 Subject: [PATCH 038/102] trigger build 1-20 --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 0631acd..7787307 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -20,7 +20,7 @@ bmcgehee/example-node-demo1: PkgInclude: - '*' - ###Below is deployment phases + ###Below is deployment phases Env: # Set any environment variables in this section. From 1401b2ac1f203eeb366c150292997cff8819547d Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 21 Jan 2016 08:04:33 -0800 Subject: [PATCH 039/102] trigger build 1-21 --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 7787307..15dc802 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgehee/example-node-demo1: +bmcgehee/example-node-demo2: # Distelli Manifest example PreBuild: From aef72ee43a7c1f72a01105b18a6ead2701db31b8 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 21 Jan 2016 08:12:53 -0800 Subject: [PATCH 040/102] trigger build 1-21a --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 15dc802..f92111f 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -9,7 +9,7 @@ bmcgehee/example-node-demo2: # Enter your build steps here! - echo "---Building---" - npm install - - echo "--Testing--" + - echo "--Testing--" - npm test #- docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" #- docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" From d3eccabe649bc87c2bd36a18325f8e9a5a185f94 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 29 Jan 2016 11:22:27 -0800 Subject: [PATCH 041/102] trigger build 1-29a --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index f92111f..1568bad 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -44,4 +44,4 @@ bmcgehee/example-node-demo2: - nodejs app.js #- sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - + From 4d032f00bf6b7e532bf65e8dc646399a4c14bb57 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 29 Jan 2016 11:31:20 -0800 Subject: [PATCH 042/102] trigger build 1-29b --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 1568bad..aa57617 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -44,4 +44,4 @@ bmcgehee/example-node-demo2: - nodejs app.js #- sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - + From d6e474f0a8295f38b169c14a9d6476c432cb801f Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 3 Feb 2016 11:28:42 -0800 Subject: [PATCH 043/102] add --rm=true --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index aa57617..25a4930 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -30,7 +30,7 @@ bmcgehee/example-node-demo2: PreInstall: # Use this section to install any deployment pre-requisites. - echo "---PreInstall---" - #- sudo docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + #- sudo docker login --rm=true -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" - echo "--Installing deploy dependencies--" - echo "-Updating apt-get-" - sudo apt-get -y update From 15988aec970bc05a4dce35e03f6f2e54c1168344 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 5 Feb 2016 13:40:48 -0800 Subject: [PATCH 044/102] fix name --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 25a4930..f84a2b7 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgehee/example-node-demo2: +bmcgehee/example-node: # Distelli Manifest example PreBuild: From ff5bb614b58f942672742a78ab36e1de8cf7f97e Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 5 Feb 2016 13:50:10 -0800 Subject: [PATCH 045/102] trigger build 2-5 --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index f84a2b7..399fc03 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -16,7 +16,7 @@ bmcgehee/example-node: #- docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" #- docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - + PkgInclude: - '*' From 5da0a747af185184832092a25218fd750d2dd074 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 10 Feb 2016 09:20:36 -0800 Subject: [PATCH 046/102] Update distelli-manifest.yml --- distelli-manifest.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 399fc03..072ebe2 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -26,6 +26,10 @@ bmcgehee/example-node: # Set any environment variables in this section. # These are available during all phases of a deploy. - PORT: "3000" + - DISTELLI_INSTALLVIEW="templates/notset.json" + + InstallTemplates: + - "views/index.jade" PreInstall: # Use this section to install any deployment pre-requisites. From 54890037c529a21babdf8835594de26d56826b11 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 10 Feb 2016 09:21:04 -0800 Subject: [PATCH 047/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 072ebe2..5f2c201 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgehee/example-node: +bmcgeheecap1/example-node: # Distelli Manifest example PreBuild: From b05c99d105ed90aa994a55124c11717a5f5860e2 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 10 Feb 2016 09:24:42 -0800 Subject: [PATCH 048/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 5f2c201..9c88eb4 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -26,7 +26,7 @@ bmcgeheecap1/example-node: # Set any environment variables in this section. # These are available during all phases of a deploy. - PORT: "3000" - - DISTELLI_INSTALLVIEW="templates/notset.json" + - DISTELLI_INSTALLVIEW: "templates/notset.json" InstallTemplates: - "views/index.jade" From 8bd4ce0bafb9424ff956c75050519a4fd97f63bd Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 10 Feb 2016 09:36:22 -0800 Subject: [PATCH 049/102] Update distelli-manifest.yml --- distelli-manifest.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 9c88eb4..21318eb 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -48,4 +48,7 @@ bmcgeheecap1/example-node: - nodejs app.js #- sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + PostStart: + - publicip=$(curl -s ident.me) + - 'echo "You can validate the install by pointing your browser at http://$publicip:$PORT"' From 5388d07e57d62f307d498a7438b5e700648cd8e4 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 10 Feb 2016 09:39:28 -0800 Subject: [PATCH 050/102] Update index.jade --- views/index.jade | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/views/index.jade b/views/index.jade index 0bb9313..4456ad8 100644 --- a/views/index.jade +++ b/views/index.jade @@ -7,9 +7,10 @@ html link(rel='stylesheet', href='./style.css') body #message -
+ {{#display_msg}} +

Running in the {{this_env}} environment

+ {{/display_msg}} #container - h1 Just a Simple Node + Express App from Distelli! + h1 Just a Simple Node + Express App h1 #{date} a(href="https://www.distelli.com" target="_blank") Built and Deployed by Distelli - From 46e169b4d3a8c5926f3acede77c93a490b252083 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 10 Feb 2016 10:27:56 -0800 Subject: [PATCH 051/102] Update distelli-manifest.yml --- distelli-manifest.yml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 21318eb..0684ae6 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -3,14 +3,14 @@ bmcgeheecap1/example-node: PreBuild: # Add any build pre-requisites here - - echo "---PreBuild---" + #- echo "---PreBuild---" Build: # Enter your build steps here! - - echo "---Building---" - - npm install - - echo "--Testing--" - - npm test + #- echo "---Building---" + #- npm install + #- echo "--Testing--" + #- npm test #- docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" #- docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" #- docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" @@ -35,14 +35,19 @@ bmcgeheecap1/example-node: # Use this section to install any deployment pre-requisites. - echo "---PreInstall---" #- sudo docker login --rm=true -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" - - echo "--Installing deploy dependencies--" - - echo "-Updating apt-get-" - - sudo apt-get -y update + #- echo "--Installing deploy dependencies--" + #- echo "-Updating apt-get-" + #- sudo apt-get -y update - echo "-Installing nodejs-" - - sudo apt-get -y install nodejs + #- sudo apt-get -y install nodejs + - curl --silent --location https://rpm.nodesource.com/setup | sudo bash - + - sudo yum -y install nodejs + - sudo yum -y groupinstall 'Development Tools' PostInstall: - echo "---PostInstall---" + - npm install + - npm test Exec: - nodejs app.js From 8ed408773bebaf10c1f03b18cd51cbf2882c56b0 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 10 Feb 2016 10:37:12 -0800 Subject: [PATCH 052/102] remove newrelic --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index e3e38b1..5e1ae02 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ }, "homepage": "https://github.com/alexleventer/NodeExpress", "dependencies": { - "newrelic": "^1.20.0", "body-parser": "^1.13.2", "express": "^4.13.1", "grunt": "^0.4.5", From 832542f31f696a92a8ae665c9447d213baada14b Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 10 Feb 2016 10:41:29 -0800 Subject: [PATCH 053/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 0684ae6..d7ad271 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -50,7 +50,7 @@ bmcgeheecap1/example-node: - npm test Exec: - - nodejs app.js + - node app.js #- sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" PostStart: From db68c203ed829b4a3c0f4f1b7022a7fa58c06d5d Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 11 Feb 2016 12:46:04 -0800 Subject: [PATCH 054/102] Create distelli_manifest.rh7.1.yml --- distelli_manifest.rh7.1.yml | 58 +++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 distelli_manifest.rh7.1.yml diff --git a/distelli_manifest.rh7.1.yml b/distelli_manifest.rh7.1.yml new file mode 100644 index 0000000..32336f8 --- /dev/null +++ b/distelli_manifest.rh7.1.yml @@ -0,0 +1,58 @@ +bmcgeheecap1/example-node: + # Distelli Manifest example + + PreBuild: + # Add any build pre-requisites here + #- echo "---PreBuild---" + + Build: + # Enter your build steps here! + #- echo "---Building---" + #- npm install + #- echo "--Testing--" + #- npm test + #- docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + #- docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" + #- docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + #- docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + + + PkgInclude: + - '*' + + ###Below is deployment phases + + Env: + # Set any environment variables in this section. + # These are available during all phases of a deploy. + - PORT: "3000" + - DISTELLI_INSTALLVIEW: "templates/notset.json" + + InstallTemplates: + - "views/index.jade" + + PreInstall: + # Use this section to install any deployment pre-requisites. + - echo "---PreInstall---" + #- sudo docker login --rm=true -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + #- echo "--Installing deploy dependencies--" + #- echo "-Updating apt-get-" + #- sudo apt-get -y update + - echo "-Installing nodejs-" + #- sudo apt-get -y install nodejs + - curl --silent --location https://rpm.nodesource.com/setup | sudo bash - + - sudo yum -y install nodejs + - sudo yum -y groupinstall 'Development Tools' + + PostInstall: + - echo "---PostInstall---" + - npm install + - npm test + + Exec: + - node app.js + #- sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + + PostStart: + - publicip=$(curl -s ident.me) + - 'echo "You can validate the install by pointing your browser at http://$publicip:$PORT"' From 96746cd3dc0b06e3cab0f511e678bcc9d05c00c7 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 11 Feb 2016 13:07:50 -0800 Subject: [PATCH 055/102] back to ubuntu --- distelli-manifest.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index d7ad271..3283638 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -39,10 +39,10 @@ bmcgeheecap1/example-node: #- echo "-Updating apt-get-" #- sudo apt-get -y update - echo "-Installing nodejs-" - #- sudo apt-get -y install nodejs - - curl --silent --location https://rpm.nodesource.com/setup | sudo bash - - - sudo yum -y install nodejs - - sudo yum -y groupinstall 'Development Tools' + - sudo apt-get -y install nodejs npm + #- curl --silent --location https://rpm.nodesource.com/setup | sudo bash - + #- sudo yum -y install nodejs + #- sudo yum -y groupinstall 'Development Tools' PostInstall: - echo "---PostInstall---" @@ -50,10 +50,10 @@ bmcgeheecap1/example-node: - npm test Exec: - - node app.js + - nodejs app.js #- sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" PostStart: - - publicip=$(curl -s ident.me) - - 'echo "You can validate the install by pointing your browser at http://$publicip:$PORT"' + #- publicip=$(curl -s ident.me) + - 'echo "You can validate the install by pointing your browser at http://PUBLIC_IP:$PORT"' From e468da13062b56f2c40975e02c0e1b5aadf20291 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 12 Feb 2016 14:52:40 -0800 Subject: [PATCH 056/102] Update old_distelli-manifest.yml --- old_distelli-manifest.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/old_distelli-manifest.yml b/old_distelli-manifest.yml index 26ade9f..f9a7a94 100644 --- a/old_distelli-manifest.yml +++ b/old_distelli-manifest.yml @@ -53,5 +53,3 @@ bmcgehee2/example-node: - node app.js - - From 9c91d7512317345e030fe68785df657125aca7c8 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 16 Feb 2016 08:43:23 -0800 Subject: [PATCH 057/102] trigger a build --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 3283638..42a7deb 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -23,7 +23,7 @@ bmcgeheecap1/example-node: ###Below is deployment phases Env: - # Set any environment variables in this section. + # Set any environment variables in this section. # These are available during all phases of a deploy. - PORT: "3000" - DISTELLI_INSTALLVIEW: "templates/notset.json" From 4ce5daa2dd9f13788ba2c3e69b4b5219ac276e76 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 1 Mar 2016 14:55:23 -0800 Subject: [PATCH 058/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 42a7deb..af5ec19 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgeheecap1/example-node: +bmcgehee/example-node2: # Distelli Manifest example PreBuild: From 9c20dce85d4e0b447a321e52381433b267d0c3af Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 1 Mar 2016 14:56:47 -0800 Subject: [PATCH 059/102] Update distelli-manifest.yml --- distelli-manifest.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index af5ec19..53d2eda 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -7,10 +7,10 @@ bmcgehee/example-node2: Build: # Enter your build steps here! - #- echo "---Building---" - #- npm install - #- echo "--Testing--" - #- npm test + - echo "---Building---" + - npm install + - echo "--Testing--" + - npm test #- docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" #- docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" #- docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" @@ -46,8 +46,8 @@ bmcgehee/example-node2: PostInstall: - echo "---PostInstall---" - - npm install - - npm test + #- npm install + #- npm test Exec: - nodejs app.js From 48963feaf60ff349269c135640f15020e75941a0 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 1 Mar 2016 15:10:56 -0800 Subject: [PATCH 060/102] Update distelli-manifest.yml --- distelli-manifest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 53d2eda..d713f97 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -36,8 +36,8 @@ bmcgehee/example-node2: - echo "---PreInstall---" #- sudo docker login --rm=true -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" #- echo "--Installing deploy dependencies--" - #- echo "-Updating apt-get-" - #- sudo apt-get -y update + - echo "-Updating apt-get-" + - sudo apt-get -y update - echo "-Installing nodejs-" - sudo apt-get -y install nodejs npm #- curl --silent --location https://rpm.nodesource.com/setup | sudo bash - From 5bde594237bd5ccd772fc5fdacdedb797ce2d271 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 1 Mar 2016 15:44:08 -0800 Subject: [PATCH 061/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index d713f97..db0b1aa 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -31,7 +31,7 @@ bmcgehee/example-node2: InstallTemplates: - "views/index.jade" - PreInstall: + PreInstall: # Use this section to install any deployment pre-requisites. - echo "---PreInstall---" #- sudo docker login --rm=true -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" From 22895fdacb159212300ab420ac1800c760346eda Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 1 Mar 2016 15:54:04 -0800 Subject: [PATCH 062/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index db0b1aa..1ed4e41 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -8,7 +8,7 @@ bmcgehee/example-node2: Build: # Enter your build steps here! - echo "---Building---" - - npm install + - npm install - echo "--Testing--" - npm test #- docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" From 8806c719a0c22f19099bd7182432894dd2066711 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 1 Mar 2016 16:04:54 -0800 Subject: [PATCH 063/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 1ed4e41..9737a57 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,5 +1,5 @@ bmcgehee/example-node2: - # Distelli Manifest example + # Distelli Manifest example PreBuild: # Add any build pre-requisites here From c81f00e44d9e05a4cb0c6ed71f32cd784feaa942 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 1 Mar 2016 16:17:35 -0800 Subject: [PATCH 064/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 9737a57..1b1794f 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -9,7 +9,7 @@ bmcgehee/example-node2: # Enter your build steps here! - echo "---Building---" - npm install - - echo "--Testing--" + - echo "--Testing--" - npm test #- docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" #- docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" From b30968298937b0c4f665ac0b1500e3405a90a5e6 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 3 Mar 2016 10:09:38 -0800 Subject: [PATCH 065/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 1b1794f..0923ca0 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgehee/example-node2: +bmcgehee/example-node: # Distelli Manifest example PreBuild: From 8572d43381c07da40a110799f7ad2156a6b14d6a Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 3 Mar 2016 10:18:27 -0800 Subject: [PATCH 066/102] Update index.jade --- views/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/index.jade b/views/index.jade index 4456ad8..df0e70b 100644 --- a/views/index.jade +++ b/views/index.jade @@ -8,7 +8,7 @@ html body #message {{#display_msg}} -

Running in the {{this_env}} environment

+

Testing TEST! in the {{this_env}} environment

{{/display_msg}} #container h1 Just a Simple Node + Express App From bb84df161088f26bc015f70e9004b818998d2c21 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 3 Mar 2016 11:33:33 -0800 Subject: [PATCH 067/102] Update distelli-manifest.yml --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 0923ca0..a35ba2c 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgehee/example-node: +bmcgehee/example-node7: # Distelli Manifest example PreBuild: From b719233c904e81ed47e78ccfe84b96bd768e390b Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 3 Mar 2016 11:39:54 -0800 Subject: [PATCH 068/102] Commit a change --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index a35ba2c..7ad1b0e 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -6,7 +6,7 @@ bmcgehee/example-node7: #- echo "---PreBuild---" Build: - # Enter your build steps here! + # Enter your build steps here! - echo "---Building---" - npm install - echo "--Testing--" From a319f934f1783b1b201edf73ad14aacb766de113 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 9 Mar 2016 12:23:58 -0800 Subject: [PATCH 069/102] Update index.jade --- views/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/index.jade b/views/index.jade index df0e70b..d448d62 100644 --- a/views/index.jade +++ b/views/index.jade @@ -8,7 +8,7 @@ html body #message {{#display_msg}} -

Testing TEST! in the {{this_env}} environment

+

Testing in the {{this_env}} environment

{{/display_msg}} #container h1 Just a Simple Node + Express App From 2fe4d0c219602118f62f33f351317b93443ac672 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 9 Mar 2016 12:28:07 -0800 Subject: [PATCH 070/102] vb --- 20160309-distelli-manifest.yml | 59 ++++++++++++++++++++++++++++++++++ distelli-manifest.yml | 9 ++---- 2 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 20160309-distelli-manifest.yml diff --git a/20160309-distelli-manifest.yml b/20160309-distelli-manifest.yml new file mode 100644 index 0000000..7ad1b0e --- /dev/null +++ b/20160309-distelli-manifest.yml @@ -0,0 +1,59 @@ +bmcgehee/example-node7: + # Distelli Manifest example + + PreBuild: + # Add any build pre-requisites here + #- echo "---PreBuild---" + + Build: + # Enter your build steps here! + - echo "---Building---" + - npm install + - echo "--Testing--" + - npm test + #- docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + #- docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" + #- docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + #- docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + + + PkgInclude: + - '*' + + ###Below is deployment phases + + Env: + # Set any environment variables in this section. + # These are available during all phases of a deploy. + - PORT: "3000" + - DISTELLI_INSTALLVIEW: "templates/notset.json" + + InstallTemplates: + - "views/index.jade" + + PreInstall: + # Use this section to install any deployment pre-requisites. + - echo "---PreInstall---" + #- sudo docker login --rm=true -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + #- echo "--Installing deploy dependencies--" + - echo "-Updating apt-get-" + - sudo apt-get -y update + - echo "-Installing nodejs-" + - sudo apt-get -y install nodejs npm + #- curl --silent --location https://rpm.nodesource.com/setup | sudo bash - + #- sudo yum -y install nodejs + #- sudo yum -y groupinstall 'Development Tools' + + PostInstall: + - echo "---PostInstall---" + #- npm install + #- npm test + + Exec: + - nodejs app.js + #- sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + + PostStart: + #- publicip=$(curl -s ident.me) + - 'echo "You can validate the install by pointing your browser at http://PUBLIC_IP:$PORT"' + diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 7ad1b0e..7f6c526 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgehee/example-node7: +bmcgeheevoicebox/example-node1: # Distelli Manifest example PreBuild: @@ -40,20 +40,15 @@ bmcgehee/example-node7: - sudo apt-get -y update - echo "-Installing nodejs-" - sudo apt-get -y install nodejs npm - #- curl --silent --location https://rpm.nodesource.com/setup | sudo bash - - #- sudo yum -y install nodejs - #- sudo yum -y groupinstall 'Development Tools' PostInstall: - echo "---PostInstall---" - #- npm install - #- npm test Exec: - nodejs app.js #- sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" PostStart: - #- publicip=$(curl -s ident.me) + - publicip=$(curl -s ident.me) || true - 'echo "You can validate the install by pointing your browser at http://PUBLIC_IP:$PORT"' From b077fc0f3862ab731c34f458b7ad3aa8be65a614 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 9 Mar 2016 12:38:03 -0800 Subject: [PATCH 071/102] fix publicip --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 7f6c526..2ec4e6a 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -50,5 +50,5 @@ bmcgeheevoicebox/example-node1: PostStart: - publicip=$(curl -s ident.me) || true - - 'echo "You can validate the install by pointing your browser at http://PUBLIC_IP:$PORT"' + - 'echo "You can validate the install by pointing your browser at http://$publicip:$PORT"' From c18997c6abe1af75f87923d91dbd49ea8dc17cb2 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 9 Mar 2016 12:40:40 -0800 Subject: [PATCH 072/102] change name --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 2ec4e6a..f3690ae 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgeheevoicebox/example-node1: +bmcgeheevoicebox/example-node: # Distelli Manifest example PreBuild: From 996de04d83e1c51ecd911f40ef4c88784c4c0843 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 9 Mar 2016 16:07:00 -0800 Subject: [PATCH 073/102] Update index.jade --- views/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/index.jade b/views/index.jade index d448d62..5bab50c 100644 --- a/views/index.jade +++ b/views/index.jade @@ -8,7 +8,7 @@ html body #message {{#display_msg}} -

Testing in the {{this_env}} environment

+

Testing in the {{this_env}} environment AND THIS IS A TEST 20160309

{{/display_msg}} #container h1 Just a Simple Node + Express App From 2865eaabad381d9b9d0324c5d1368b63cd94dfb8 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 21 Mar 2016 17:01:12 -0700 Subject: [PATCH 074/102] clean --- distelli-manifest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index f3690ae..6ad8ed3 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -37,6 +37,7 @@ bmcgeheevoicebox/example-node: #- sudo docker login --rm=true -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" #- echo "--Installing deploy dependencies--" - echo "-Updating apt-get-" + - sudo apt-get -y clean - sudo apt-get -y update - echo "-Installing nodejs-" - sudo apt-get -y install nodejs npm From 799f4fa20f51f579f196a5e625d42a8d45b7cead Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 21 Mar 2016 17:02:43 -0700 Subject: [PATCH 075/102] clean --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 6ad8ed3..4135755 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,4 +1,4 @@ -bmcgeheevoicebox/example-node: +bmcgehee/example-node: # Distelli Manifest example PreBuild: From be94468a7dd58e4bb1dd0fa7b3ba520537b952e0 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 21 Mar 2016 17:06:19 -0700 Subject: [PATCH 076/102] test --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 4135755..c18089d 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -40,7 +40,7 @@ bmcgehee/example-node: - sudo apt-get -y clean - sudo apt-get -y update - echo "-Installing nodejs-" - - sudo apt-get -y install nodejs npm + - sudo apt-get -y install nodejs npm PostInstall: - echo "---PostInstall---" From aa53df6fad5e8b88ac7abf2e3ef9130ce906c723 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 25 Mar 2016 10:30:24 -0700 Subject: [PATCH 077/102] Trigger Build Friday --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a7a46e..81bc515 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have a server you can use a virtual server. For a simple guide to s You must install the Distelli agent on the server to facilitate deployments. Instructions on installing the Distelli agent can be found here Distelli agent reference guide. -Install the agent and return to this document. +Install the agent and return to this document. ### Step 2. Fork and Clone the Repository From a304a394838d11715aa06ed2cd3db774894dda66 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 8 Apr 2016 15:01:33 -0700 Subject: [PATCH 078/102] back to docker --- distelli-manifest.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index c18089d..43c8a0b 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -4,6 +4,10 @@ bmcgehee/example-node: PreBuild: # Add any build pre-requisites here #- echo "---PreBuild---" + + CommitData: + - RepoType: Git + - RepoPath: . Build: # Enter your build steps here! From 99d5c18747321dcf1b469a06ba6aba64799f5c40 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 8 Apr 2016 15:02:57 -0700 Subject: [PATCH 079/102] back to docker2 --- distelli-manifest.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 43c8a0b..2ebf312 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -15,11 +15,10 @@ bmcgehee/example-node: - npm install - echo "--Testing--" - npm test - #- docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" - #- docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" - #- docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - #- docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - + - docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + - docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" + - docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + - docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" PkgInclude: - '*' @@ -38,20 +37,20 @@ bmcgehee/example-node: PreInstall: # Use this section to install any deployment pre-requisites. - echo "---PreInstall---" - #- sudo docker login --rm=true -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + - sudo docker login --rm=true -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" #- echo "--Installing deploy dependencies--" - - echo "-Updating apt-get-" - - sudo apt-get -y clean - - sudo apt-get -y update - - echo "-Installing nodejs-" - - sudo apt-get -y install nodejs npm + #- echo "-Updating apt-get-" + #- sudo apt-get -y clean + #- sudo apt-get -y update + #- echo "-Installing nodejs-" + #- sudo apt-get -y install nodejs npm PostInstall: - echo "---PostInstall---" Exec: - - nodejs app.js - #- sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + #- nodejs app.js + - sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" PostStart: - publicip=$(curl -s ident.me) || true From 27304ad3e0a7feb1f3d94e3222acd6cde5576ba1 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 8 Apr 2016 15:07:17 -0700 Subject: [PATCH 080/102] Docker3 --- distelli-manifest.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 2ebf312..07d181a 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -10,6 +10,9 @@ bmcgehee/example-node: - RepoPath: . Build: + - echo "DD_USERNAME - $DISTELLI_DOCKER_USERNAME" + - echo "DD_EMAIL - $DISTELLI_DOCKER_ENDPOINT" + - echo "DD_ENDPOINT - $DISTELLI_DOCKER_ENDPOINt" # Enter your build steps here! - echo "---Building---" - npm install @@ -37,7 +40,7 @@ bmcgehee/example-node: PreInstall: # Use this section to install any deployment pre-requisites. - echo "---PreInstall---" - - sudo docker login --rm=true -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + - sudo docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" #- echo "--Installing deploy dependencies--" #- echo "-Updating apt-get-" #- sudo apt-get -y clean From 91197e633f15458a632021d18960bbef9394a868 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 8 Apr 2016 15:11:46 -0700 Subject: [PATCH 081/102] Docker4 --- distelli-manifest.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 07d181a..25d5f1e 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -11,8 +11,10 @@ bmcgehee/example-node: Build: - echo "DD_USERNAME - $DISTELLI_DOCKER_USERNAME" - - echo "DD_EMAIL - $DISTELLI_DOCKER_ENDPOINT" - - echo "DD_ENDPOINT - $DISTELLI_DOCKER_ENDPOINt" + - echo "DD_EMAIL - $DISTELLI_DOCKER_EMAIL" + - echo "DD_ENDPOINT - $DISTELLI_DOCKER_ENDPOINT" + - echo "DD_REPO - $DISTELLI_DOCKER_REPO" + # Enter your build steps here! - echo "---Building---" - npm install @@ -22,6 +24,10 @@ bmcgehee/example-node: - docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" - docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + #- docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + #- docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" + #- docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + #- docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" PkgInclude: - '*' From 84a8a13010be0a419522d011366f1d5d8e97aaa1 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 8 Apr 2016 16:00:41 -0700 Subject: [PATCH 082/102] Docker5 --- distelli-manifest.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 25d5f1e..825cdc2 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -24,10 +24,6 @@ bmcgehee/example-node: - docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" - docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - #- docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" - #- docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" - #- docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - #- docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" PkgInclude: - '*' From b2813b8357ddd8dfa0d0585e308e621eb4a0f145 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 12 Apr 2016 13:19:59 -0700 Subject: [PATCH 083/102] Remove docker --- distelli-manifest.yml | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 825cdc2..a60b7b2 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -5,25 +5,25 @@ bmcgehee/example-node: # Add any build pre-requisites here #- echo "---PreBuild---" - CommitData: - - RepoType: Git - - RepoPath: . + #CommitData: + #- RepoType: Git + #- RepoPath: . Build: - - echo "DD_USERNAME - $DISTELLI_DOCKER_USERNAME" - - echo "DD_EMAIL - $DISTELLI_DOCKER_EMAIL" - - echo "DD_ENDPOINT - $DISTELLI_DOCKER_ENDPOINT" - - echo "DD_REPO - $DISTELLI_DOCKER_REPO" + #- echo "DD_USERNAME - $DISTELLI_DOCKER_USERNAME" + #- echo "DD_EMAIL - $DISTELLI_DOCKER_EMAIL" + #- echo "DD_ENDPOINT - $DISTELLI_DOCKER_ENDPOINT" + #- echo "DD_REPO - $DISTELLI_DOCKER_REPO" # Enter your build steps here! - echo "---Building---" - npm install - echo "--Testing--" - npm test - - docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" - - docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" - - docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" - - docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + #- docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + #- docker build --quiet=false -t "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_PATH" + #- docker tag "$DISTELLI_DOCKER_REPO" "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + #- docker push "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" PkgInclude: - '*' @@ -34,28 +34,28 @@ bmcgehee/example-node: # Set any environment variables in this section. # These are available during all phases of a deploy. - PORT: "3000" - - DISTELLI_INSTALLVIEW: "templates/notset.json" + #- DISTELLI_INSTALLVIEW: "templates/notset.json" - InstallTemplates: - - "views/index.jade" + #InstallTemplates: + #- "views/index.jade" PreInstall: # Use this section to install any deployment pre-requisites. - echo "---PreInstall---" - - sudo docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" - #- echo "--Installing deploy dependencies--" - #- echo "-Updating apt-get-" - #- sudo apt-get -y clean - #- sudo apt-get -y update - #- echo "-Installing nodejs-" - #- sudo apt-get -y install nodejs npm + #- sudo docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" -e "$DISTELLI_DOCKER_EMAIL" "$DISTELLI_DOCKER_ENDPOINT" + - echo "--Installing deploy dependencies--" + - echo "-Updating apt-get-" + - sudo apt-get -y clean + - sudo apt-get -y update + - echo "-Installing nodejs-" + - sudo apt-get -y install nodejs PostInstall: - echo "---PostInstall---" Exec: - #- nodejs app.js - - sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" + - nodejs app.js + #- sudo docker run "$DISTELLI_DOCKER_PORTS" --rm=true "$DISTELLI_DOCKER_REPO:$DISTELLI_BUILDNUM" PostStart: - publicip=$(curl -s ident.me) || true From ea9c44bad05a3ee2003eaa5e89e55663d6ad5bb0 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 13 Apr 2016 14:22:29 -0700 Subject: [PATCH 084/102] Commit Change Demo --- distelli-manifest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index a60b7b2..9260821 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -61,3 +61,4 @@ bmcgehee/example-node: - publicip=$(curl -s ident.me) || true - 'echo "You can validate the install by pointing your browser at http://$publicip:$PORT"' + From 248d4b609fe25cefb4c01d0851021807840db43c Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 13 Apr 2016 14:28:29 -0700 Subject: [PATCH 085/102] Update distelli-manifest.yml --- distelli-manifest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 9260821..facaeb6 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -34,10 +34,10 @@ bmcgehee/example-node: # Set any environment variables in this section. # These are available during all phases of a deploy. - PORT: "3000" - #- DISTELLI_INSTALLVIEW: "templates/notset.json" + - DISTELLI_INSTALLVIEW: "templates/notset.json" - #InstallTemplates: - #- "views/index.jade" + InstallTemplates: + - "views/index.jade" PreInstall: # Use this section to install any deployment pre-requisites. From 89ace0103826c667b614585887e6f3e986eee354 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 18 Apr 2016 15:19:11 -0700 Subject: [PATCH 086/102] trigger build 4/18 --- distelli-manifest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index facaeb6..bb88446 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -62,3 +62,4 @@ bmcgehee/example-node: - 'echo "You can validate the install by pointing your browser at http://$publicip:$PORT"' + From be7ab735f835c68c14c9ab5964df3b457ad489ce Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Tue, 19 Apr 2016 11:12:41 -0700 Subject: [PATCH 087/102] 2016-04-19 trigger build --- distelli-manifest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index bb88446..0cb4e30 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -61,5 +61,7 @@ bmcgehee/example-node: - publicip=$(curl -s ident.me) || true - 'echo "You can validate the install by pointing your browser at http://$publicip:$PORT"' + + From cd6fae2217c897ce7ede5584fbb4bb5ad5e6f657 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 20 Apr 2016 10:23:46 -0700 Subject: [PATCH 088/102] trigger build 4/20 --- views/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/index.jade b/views/index.jade index 5bab50c..5b4fb59 100644 --- a/views/index.jade +++ b/views/index.jade @@ -8,7 +8,7 @@ html body #message {{#display_msg}} -

Testing in the {{this_env}} environment AND THIS IS A TEST 20160309

+

Testing in the {{this_env}} environment AND THIS IS A TEST 2016-04-20

{{/display_msg}} #container h1 Just a Simple Node + Express App From 79af986bc9bd288da9e096e296f7995432be3e36 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Mon, 25 Apr 2016 13:24:44 -0700 Subject: [PATCH 089/102] 2016-04 trigger build --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index 0cb4e30..e4f011e 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -61,7 +61,7 @@ bmcgehee/example-node: - publicip=$(curl -s ident.me) || true - 'echo "You can validate the install by pointing your browser at http://$publicip:$PORT"' - + From c8706936e223b467f4323382bdd06fa8ce1be395 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 11 May 2016 13:15:46 -0700 Subject: [PATCH 090/102] trigger build 5/11 --- distelli-manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distelli-manifest.yml b/distelli-manifest.yml index e4f011e..4c3aea7 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -6,7 +6,7 @@ bmcgehee/example-node: #- echo "---PreBuild---" #CommitData: - #- RepoType: Git + #- RepoType: Git #- RepoPath: . Build: From 4094f4af73bf7b734703719278f1a93d86597b4e Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Sat, 14 May 2016 12:29:13 -0700 Subject: [PATCH 091/102] Testing branch pr and commit. --- test.20160514a | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test.20160514a diff --git a/test.20160514a b/test.20160514a new file mode 100644 index 0000000..e69de29 From f88fca33197488bd70215075cd4a3ab0bdfa6e45 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Sat, 14 May 2016 12:31:30 -0700 Subject: [PATCH 092/102] Testing branch pr and commit2. --- test.20160514a-2 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test.20160514a-2 diff --git a/test.20160514a-2 b/test.20160514a-2 new file mode 100644 index 0000000..e69de29 From ae86bb345fa1963be92eed6eb4a7591c0d55c7a7 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Sat, 14 May 2016 12:41:57 -0700 Subject: [PATCH 093/102] testing name develop --- test.develop | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test.develop diff --git a/test.develop b/test.develop new file mode 100644 index 0000000..e69de29 From d87de1e6a52701d5f5ca93d7a53ec476fb760d75 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 4 Oct 2017 16:00:36 -0700 Subject: [PATCH 094/102] test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81bc515..ce9d49f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This tutorial will get you setup, building, testing, and deploying an application with Distelli in minutes. -The tutorial assumes you have already: +The tutorial assumes you have already: * [Created a free Distelli account](https://www.distelli.com/signup) * Have a login to, at least, one of the two public repositories. - https://github.com/ From 77632c1b48ba0be3f3557e202da547327460ecb0 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Wed, 4 Oct 2017 16:01:03 -0700 Subject: [PATCH 095/102] test2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ce9d49f..6eaabc8 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The tutorial assumes you have already: The scenario also expects that you have a **Destination** server available to do deployments of the example application. -### Step 1. Prepare Server for Deployment +### Step 1. Prepare Server for Deployment To enable auto deployment of an application you must have a destination server to deploy to. From 2d85dbf811614a67cd49814ba737ed647be209bf Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Fri, 8 Dec 2017 11:30:14 -0800 Subject: [PATCH 096/102] test1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6eaabc8..8620c33 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Getting Started Building and Deploying with Distelli - NodeJS Example +develop# Getting Started Building and Deploying with Distelli - NodeJS Example This tutorial will get you setup, building, testing, and deploying an application with Distelli in minutes. From 9a5bdacfa68cd6842e3800b3244455b48b164509 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 8 Nov 2018 13:13:29 -0800 Subject: [PATCH 097/102] testing --- 2018-11-07-testing.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 2018-11-07-testing.txt diff --git a/2018-11-07-testing.txt b/2018-11-07-testing.txt new file mode 100644 index 0000000..e69de29 From 0e112a47486a07b08d6a085fdc02b80236ebbb4a Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 8 Nov 2018 13:52:38 -0800 Subject: [PATCH 098/102] testing --- 2018-11-07-testing2.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 2018-11-07-testing2.txt diff --git a/2018-11-07-testing2.txt b/2018-11-07-testing2.txt new file mode 100644 index 0000000..e69de29 From a145a98ed268f6cac118161a378c50d81c180beb Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 8 Nov 2018 13:56:07 -0800 Subject: [PATCH 099/102] testing3 --- 2018-11-07-testing3.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 2018-11-07-testing3.txt diff --git a/2018-11-07-testing3.txt b/2018-11-07-testing3.txt new file mode 100644 index 0000000..e69de29 From 823d68b7f4db40d66921397d927040c31836fca0 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 8 Nov 2018 14:01:04 -0800 Subject: [PATCH 100/102] testing3 --- 2018-11-07-testing4.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 2018-11-07-testing4.txt diff --git a/2018-11-07-testing4.txt b/2018-11-07-testing4.txt new file mode 100644 index 0000000..e69de29 From 1d4b28ca30f8e7fd20cfd07e3e61f6bcca73bb54 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 8 Nov 2018 14:04:25 -0800 Subject: [PATCH 101/102] testing5 --- 2018-11-07-testing5.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 2018-11-07-testing5.txt diff --git a/2018-11-07-testing5.txt b/2018-11-07-testing5.txt new file mode 100644 index 0000000..e69de29 From e96fa09211b7fc5898fbc7642d1be34a208f0626 Mon Sep 17 00:00:00 2001 From: Brian McGehee Date: Thu, 8 Nov 2018 14:45:09 -0800 Subject: [PATCH 102/102] testing6 --- 2018-11-07-testing6.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 2018-11-07-testing6.txt diff --git a/2018-11-07-testing6.txt b/2018-11-07-testing6.txt new file mode 100644 index 0000000..e69de29