From 467c27cb602f1f9efcec695b7e54f88199b2f58d Mon Sep 17 00:00:00 2001 From: raziel Date: Tue, 3 May 2016 18:07:04 -0700 Subject: [PATCH 01/89] removing expose fro Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1f71686e5..90918098e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,5 @@ RUN npm install -g gulp WORKDIR /src #ENV DEBUG=* -EXPOSE 8080 5222 CMD ["npm", "start"] From ec545041cc3f108f477a05ea457e9d5fd7b41a74 Mon Sep 17 00:00:00 2001 From: raziel Date: Tue, 3 May 2016 18:14:35 -0700 Subject: [PATCH 02/89] change order of commands in Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 90918098e..e312007ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ FROM node:0.10-slim +RUN npm install -g mocha +RUN npm install -g istanbul +RUN npm install -g gulp COPY ./package.json /src/package.json RUN cd /src && npm install COPY ./ /src -RUN npm install -g mocha -RUN npm install -g istanbul -RUN npm install -g gulp WORKDIR /src #ENV DEBUG=* From bc46ff6dff8ee82bbe1937904c8081a6e0503991 Mon Sep 17 00:00:00 2001 From: raziel Date: Sun, 8 May 2016 20:25:36 -0700 Subject: [PATCH 03/89] updating less module in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cac06b685..64296ce00 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "helmet": "^0.11.0", "i18n": "^0.5.0", "js-yaml": "^3.4.2", - "less": "^2.5.1", + "less": "2.6.1", "lodash": "^3.10.1", "md5": "^2.0.0", "migroose": "^0.5.0", From 2bf04b0d15c47d7c185d5370e990ff87f89a8633 Mon Sep 17 00:00:00 2001 From: Ben Meiri Date: Tue, 21 Jun 2016 12:36:10 +0300 Subject: [PATCH 04/89] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 8e485467e..ea2916af1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ ![Let's Chat Greylock](http://i.imgur.com/0a3l5VF.png) -#test1 -#test2 ![Screenshot](http://i.imgur.com/C4uMD67.png) Test Test A self-hosted chat app for small teams or big Gal by [Security Compass][seccom]. From 387d8569a896b78d138d4f41df80c2d854696d75 Mon Sep 17 00:00:00 2001 From: Ben Meiri Date: Tue, 21 Jun 2016 14:19:36 +0300 Subject: [PATCH 05/89] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index ea2916af1..6b67ee614 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ ![Let's Chat Greylock](http://i.imgur.com/0a3l5VF.png) ![Screenshot](http://i.imgur.com/C4uMD67.png) -Test Test A self-hosted chat app for small teams or big Gal by [Security Compass][seccom]. [![Build Status](https://travis-ci.org/sdelements/lets-chat.svg?branch=master)](https://travis-ci.org/sdelements/lets-chat) From f4bea460ef160b30429e48cd41e7e7e6c24b4646 Mon Sep 17 00:00:00 2001 From: raziel Date: Sat, 13 Aug 2016 09:59:19 -0700 Subject: [PATCH 06/89] adding docker-compose --- docker-compose.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..2e646c5aa --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +version: '2' +services: + web: + build: . + ports: + - 5000:5000 + mongo: + image: mongo + From c6c36e6c738471aeaf86b5c113b4b085afd18497 Mon Sep 17 00:00:00 2001 From: raziel Date: Tue, 20 Sep 2016 11:36:00 -0700 Subject: [PATCH 07/89] adding codefresh.yml --- Dockerfile_prod | 1 + codefresh.yml | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 Dockerfile_prod create mode 100644 codefresh.yml diff --git a/Dockerfile_prod b/Dockerfile_prod new file mode 100644 index 000000000..bf45650a0 --- /dev/null +++ b/Dockerfile_prod @@ -0,0 +1 @@ +FROM node:onbuild diff --git a/codefresh.yml b/codefresh.yml new file mode 100644 index 000000000..6699cf1c8 --- /dev/null +++ b/codefresh.yml @@ -0,0 +1,33 @@ +version: '1.0' +steps: + + + unit-tests: + image: monostream/nodejs-gulp-bower:latest + fail-fast: false + working-directory : ${{initial-clone}} + commands: + - npm install + - gulp test + - echo $(date) + + + build-step: + type: build + dockerfile: Dockerfile_prod + image-name: containers101/demochat + tag: ${{CF_BRANCH}} + + push to registry: + type: push + candidate: ${{build-step}} + tag: ${{CF_BRANCH}} + + + after-build: + image: node:latest + fail-fast: false + commands : + - echo 'after build' + + From 465d19d83665d188bb25cfdeca663935aa863d96 Mon Sep 17 00:00:00 2001 From: raziel Date: Tue, 20 Sep 2016 11:53:11 -0700 Subject: [PATCH 08/89] change node version --- Dockerfile_prod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile_prod b/Dockerfile_prod index bf45650a0..3862c43a1 100644 --- a/Dockerfile_prod +++ b/Dockerfile_prod @@ -1 +1 @@ -FROM node:onbuild +FROM node:0.10-onbuild From bc67b6a3d2de392a6cbe8584e7026e785e3d8bc3 Mon Sep 17 00:00:00 2001 From: raziel Date: Tue, 20 Sep 2016 13:21:00 -0700 Subject: [PATCH 09/89] change node version --- Dockerfile_prod | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Dockerfile_prod b/Dockerfile_prod index 3862c43a1..49e3ae6a7 100644 --- a/Dockerfile_prod +++ b/Dockerfile_prod @@ -1 +1,12 @@ -FROM node:0.10-onbuild +FROM node:0.10-slim + +COPY ./package.json /src/package.json +RUN cd /src && npm install +COPY ./ /src + +WORKDIR /src +#ENV DEBUG=* + + +CMD ["npm", "start"] + From 7752270436b6412116e3ecc7348ffb62489d360e Mon Sep 17 00:00:00 2001 From: raziel Date: Tue, 20 Sep 2016 13:31:22 -0700 Subject: [PATCH 10/89] change node version --- codefresh.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/codefresh.yml b/codefresh.yml index 6699cf1c8..214ff3567 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -24,10 +24,5 @@ steps: tag: ${{CF_BRANCH}} - after-build: - image: node:latest - fail-fast: false - commands : - - echo 'after build' From 8afaf3e4c37cff1ea756c17f0047c28419e2c7f4 Mon Sep 17 00:00:00 2001 From: Alon Diamant Date: Wed, 5 Oct 2016 17:40:55 +0300 Subject: [PATCH 11/89] Update defaults.yml --- defaults.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults.yml b/defaults.yml index d678b926e..184b059ba 100644 --- a/defaults.yml +++ b/defaults.yml @@ -31,7 +31,7 @@ xmpp: cert: ./server.crt database: - uri: mongodb://mongo:27017/hp_mongo + uri: mongodb://database:27017/hp_mongo secrets: cookie: secretsauce From df77655d819df4af8ddc6a6b25ac88aeda82d647 Mon Sep 17 00:00:00 2001 From: Alon Diamant Date: Wed, 5 Oct 2016 17:43:31 +0300 Subject: [PATCH 12/89] Update defaults.yml --- defaults.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults.yml b/defaults.yml index 184b059ba..d678b926e 100644 --- a/defaults.yml +++ b/defaults.yml @@ -31,7 +31,7 @@ xmpp: cert: ./server.crt database: - uri: mongodb://database:27017/hp_mongo + uri: mongodb://mongo:27017/hp_mongo secrets: cookie: secretsauce From 21478af61662a7339844c14dfb5868c2ad6857cb Mon Sep 17 00:00:00 2001 From: Alon Diamant Date: Wed, 5 Oct 2016 17:47:05 +0300 Subject: [PATCH 13/89] Create settings.yml --- settings.yml | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 settings.yml diff --git a/settings.yml b/settings.yml new file mode 100644 index 000000000..be3ef5865 --- /dev/null +++ b/settings.yml @@ -0,0 +1,78 @@ +# +# Let's Chat Built-in Defaults +# + +env: development # development / production + +http: + enable: true + host: + port: 5000 + +https: + enable: false + host: + port: 5001 + key: key.pem + cert: certificate.pem + +xmpp: + enable: false + roomCreation: false + debug: + handled: false + unhandled: false + port: 5222 + domain: example.com + username: node # node / full + tls: + enable: false + key: ./server.key + cert: ./server.crt + +database: + uri: mongodb://dbserver:27017/hp_mongo + +secrets: + cookie: secretsauce + +files: + enable: false + provider: local + maxFileSize: 100000000 + restrictTypes: true + allowedTypes: + - 'image/jpeg' + - 'image/png' + - 'image/gif' + local: + dir: uploads + +auth: + throttling: + enable: true + threshold: 3 + providers: [local] # [local, kerberos, ldap] - You can specify the order + local: + enableRegistration: true + passwordRegex: ^.{8,64}$ + +private: + enable: false + roster: online # online / all + expire: 360 # false or number of minutes + +noRobots: true # Serve robots.txt with disallow + +giphy: + enable: true + rating: pg-13 + limit: 24 + apiKey: dc6zaTOxFJmzC + +rooms: + private: false + +i18n: + locale: en + From 7d28cee5529b181c7a0f63d68908b9e20bea5411 Mon Sep 17 00:00:00 2001 From: Alon Diamant Date: Thu, 6 Oct 2016 11:41:21 +0300 Subject: [PATCH 14/89] Added multiple connection tries --- app.js | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/app.js b/app.js index 0893b113f..3d5069b8a 100644 --- a/app.js +++ b/app.js @@ -259,14 +259,26 @@ function checkForMongoTextSearch() { }); } -mongoose.connect(settings.database.uri, function(err) { - if (err) { - throw err; +var connectionTries = 0; + +function handleMongoConnectionState(err) { + + if (err) { + connectionTries++; + if (connectionTries < 3) { + console.log('Error connecting to database, will retry: ' + err.toString()); + setTimeout(tryConnect(), 2000); + return; + } + else { + throw err; + } } checkForMongoTextSearch(); migroose.needsMigration(function(err, migrationRequired) { + if (err) { console.error(err); } @@ -283,5 +295,10 @@ mongoose.connect(settings.database.uri, function(err) { } startApp(); - }); -}); + } +} + +function tryConnect() { + mongoose.connect(settings.database.uri, handleMongoConnectionState); +} + From f7f585c6029eff4fce32ec79fb1bd3588ad3b7b6 Mon Sep 17 00:00:00 2001 From: Alon Diamant Date: Thu, 6 Oct 2016 11:46:56 +0300 Subject: [PATCH 15/89] Update app.js --- app.js | 157 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 79 insertions(+), 78 deletions(-) diff --git a/app.js b/app.js index 3d5069b8a..146c8ddd1 100644 --- a/app.js +++ b/app.js @@ -8,40 +8,40 @@ process.title = 'letschat'; require('colors'); -var _ = require('lodash'), - path = require('path'), - fs = require('fs'), - express = require('express.oi'), - i18n = require('i18n'), - bodyParser = require('body-parser'), +var _ = require('lodash'), + path = require('path'), + fs = require('fs'), + express = require('express.oi'), + i18n = require('i18n'), + bodyParser = require('body-parser'), cookieParser = require('cookie-parser'), - compression = require('compression'), - helmet = require('helmet'), - http = require('http'), - nunjucks = require('nunjucks'), - mongoose = require('mongoose'), - migroose = require('./migroose'), + compression = require('compression'), + helmet = require('helmet'), + http = require('http'), + nunjucks = require('nunjucks'), + mongoose = require('mongoose'), + migroose = require('./migroose'), connectMongo = require('connect-mongo'), - all = require('require-tree'), - psjon = require('./package.json'), - settings = require('./app/config'), - auth = require('./app/auth/index'), - core = require('./app/core/index'); - -var MongoStore = connectMongo(express.session), - httpEnabled = settings.http && settings.http.enable, + all = require('require-tree'), + psjon = require('./package.json'), + settings = require('./app/config'), + auth = require('./app/auth/index'), + core = require('./app/core/index'); + +var MongoStore = connectMongo(express.session), + httpEnabled = settings.http && settings.http.enable, httpsEnabled = settings.https && settings.https.enable, - models = all(path.resolve('./app/models')), - middlewares = all(path.resolve('./app/middlewares')), - controllers = all(path.resolve('./app/controllers')), + models = all(path.resolve('./app/models')), + middlewares = all(path.resolve('./app/middlewares')), + controllers = all(path.resolve('./app/controllers')), app; // // express.oi Setup // if (httpsEnabled) { - app = express().https({ - key: fs.readFileSync(settings.https.key), + app = express().https({ + key: fs.readFileSync(settings.https.key), cert: fs.readFileSync(settings.https.cert) }).io(); } else { @@ -56,17 +56,17 @@ if (settings.env === 'production') { // Session var sessionStore = new MongoStore({ - url: settings.database.uri, + url: settings.database.uri, autoReconnect: true }); // Session var session = { - key: 'connect.sid', - secret: settings.secrets.cookie, - store: sessionStore, - cookie: { secure: httpsEnabled }, - resave: false, + key: 'connect.sid', + secret: settings.secrets.cookie, + store: sessionStore, + cookie: { secure: httpsEnabled }, + resave: false, saveUninitialized: true }; @@ -85,32 +85,32 @@ app.use(helmet.ieNoOpen()); app.use(helmet.noSniff()); app.use(helmet.xssFilter()); app.use(helmet.hsts({ - maxAge: 31536000, + maxAge: 31536000, includeSubdomains: true, - force: httpsEnabled, - preload: true + force: httpsEnabled, + preload: true })); app.use(helmet.contentSecurityPolicy({ defaultSrc: ['\'none\''], connectSrc: ['*'], - scriptSrc: ['\'self\'', '\'unsafe-eval\''], - styleSrc: ['\'self\'', 'fonts.googleapis.com', '\'unsafe-inline\''], - fontSrc: ['\'self\'', 'fonts.gstatic.com'], - mediaSrc: ['\'self\''], - objectSrc: ['\'self\''], - imgSrc: ['*'] + scriptSrc: ['\'self\'', '\'unsafe-eval\''], + styleSrc: ['\'self\'', 'fonts.googleapis.com', '\'unsafe-inline\''], + fontSrc: ['\'self\'', 'fonts.gstatic.com'], + mediaSrc: ['\'self\''], + objectSrc: ['\'self\''], + imgSrc: ['*'] })); var bundles = {}; app.use(require('connect-assets')({ - paths: [ + paths: [ 'media/js', 'media/less' ], - helperContext: bundles, - build: settings.env === 'production', + helperContext: bundles, + build: settings.env === 'production', fingerprinting: settings.env === 'production', - servePath: 'media/dist' + servePath: 'media/dist' })); // Public @@ -121,24 +121,24 @@ app.use('/media', express.static(__dirname + '/media', { // Templates var nun = nunjucks.configure('templates', { autoescape: true, - express: app, - tags: { - blockStart: '<%', - blockEnd: '%>', + express: app, + tags: { + blockStart: '<%', + blockEnd: '%>', variableStart: '<$', - variableEnd: '$>', - commentStart: '<#', - commentEnd: '#>' + variableEnd: '$>', + commentStart: '<#', + commentEnd: '#>' } }); function wrapBundler(func) { // This method ensures all assets paths start with "./" // Making them relative, and not absolute - return function() { + return function () { return func.apply(func, arguments) - .replace(/href="\//g, 'href="./') - .replace(/src="\//g, 'src="./'); + .replace(/href="\//g, 'href="./') + .replace(/src="\//g, 'src="./'); }; } @@ -148,7 +148,7 @@ nun.addGlobal('text_search', false); // i18n i18n.configure({ - directory: __dirname + '/locales', + directory: __dirname + '/locales', defaultLocale: settings.i18n && settings.i18n.locale || 'en' }); app.use(i18n.init); @@ -160,7 +160,7 @@ app.use(bodyParser.urlencoded({ })); // IE header -app.use(function(req, res, next) { +app.use(function (req, res, next) { res.setHeader('X-UA-Compatible', 'IE=Edge,chrome=1'); next(); }); @@ -168,13 +168,13 @@ app.use(function(req, res, next) { // // Controllers // -_.each(controllers, function(controller) { +_.each(controllers, function (controller) { controller.apply({ - app: app, - core: core, - settings: settings, + app: app, + core: core, + settings: settings, middlewares: middlewares, - models: models, + models: models, controllers: controllers }); }); @@ -187,7 +187,7 @@ mongoose.connection.on('error', function (err) { throw new Error(err); }); -mongoose.connection.on('disconnected', function() { +mongoose.connection.on('disconnected', function () { throw new Error('Could not connect to database'); }); @@ -197,17 +197,16 @@ mongoose.connection.on('disconnected', function() { function startApp() { var port = httpsEnabled && settings.https.port || - httpEnabled && settings.http.port; + httpEnabled && settings.http.port; var host = httpsEnabled && settings.https.host || - httpEnabled && settings.http.host || '0.0.0.0'; - + httpEnabled && settings.http.host || '0.0.0.0'; if (httpsEnabled && httpEnabled) { // Create an HTTP -> HTTPS redirect server var redirectServer = express(); - redirectServer.get('*', function(req, res) { + redirectServer.get('*', function (req, res) { var urlPort = port === 80 ? '' : ':' + port; res.redirect('https://' + req.hostname + urlPort + req.path); }); @@ -247,11 +246,11 @@ function checkForMongoTextSearch() { return; } - if(version[0] < 2) { + if (version[0] < 2) { return; } - if(version[0] === '2' && version[1] < 6) { + if (version[0] === '2' && version[1] < 6) { return; } @@ -262,12 +261,12 @@ function checkForMongoTextSearch() { var connectionTries = 0; function handleMongoConnectionState(err) { - - if (err) { - connectionTries++; + + if (err) { + connectionTries++; if (connectionTries < 3) { - console.log('Error connecting to database, will retry: ' + err.toString()); - setTimeout(tryConnect(), 2000); + console.log('Error connecting to database (will retry in 2 seconds): ' + err.toString()); + setTimeout(tryConnect, 2000); return; } else { @@ -277,13 +276,14 @@ function handleMongoConnectionState(err) { checkForMongoTextSearch(); - migroose.needsMigration(function(err, migrationRequired) { - + migroose.needsMigration(function (err, migrationRequired) { + if (err) { console.error(err); } else if (migrationRequired) { + console.log('Database migration required'.red); console.log('Ensure you backup your database first.'); console.log(''); @@ -295,10 +295,11 @@ function handleMongoConnectionState(err) { } startApp(); - } + }); + } -function tryConnect() { +function tryConnect() { mongoose.connect(settings.database.uri, handleMongoConnectionState); } - + From cabb8c9a58463481da91d9de0b6a4f21e1d79811 Mon Sep 17 00:00:00 2001 From: Alon Diamant Date: Thu, 6 Oct 2016 11:55:08 +0300 Subject: [PATCH 16/89] Updating app.js --- app.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app.js b/app.js index 146c8ddd1..c8f6bf1ce 100644 --- a/app.js +++ b/app.js @@ -293,7 +293,8 @@ function handleMongoConnectionState(err) { return process.exit(); } - + + console.log('Starting app.'); startApp(); }); From 53cfaa4fe51c757c1d9d0f1af32329b69bafbaae Mon Sep 17 00:00:00 2001 From: Alon Diamant Date: Thu, 6 Oct 2016 12:03:58 +0300 Subject: [PATCH 17/89] Calling tryConnect().. --- app.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app.js b/app.js index c8f6bf1ce..42f861ecf 100644 --- a/app.js +++ b/app.js @@ -301,6 +301,8 @@ function handleMongoConnectionState(err) { } function tryConnect() { + console.log('Connecting to database...'); mongoose.connect(settings.database.uri, handleMongoConnectionState); } +tryConnect(); From fa7b38324f756edc3c4b2f104fa6f69902861e75 Mon Sep 17 00:00:00 2001 From: Alon Diamant Date: Thu, 6 Oct 2016 16:12:15 +0300 Subject: [PATCH 18/89] Deleting settings.yml --- settings.yml | 78 ---------------------------------------------------- 1 file changed, 78 deletions(-) delete mode 100644 settings.yml diff --git a/settings.yml b/settings.yml deleted file mode 100644 index be3ef5865..000000000 --- a/settings.yml +++ /dev/null @@ -1,78 +0,0 @@ -# -# Let's Chat Built-in Defaults -# - -env: development # development / production - -http: - enable: true - host: - port: 5000 - -https: - enable: false - host: - port: 5001 - key: key.pem - cert: certificate.pem - -xmpp: - enable: false - roomCreation: false - debug: - handled: false - unhandled: false - port: 5222 - domain: example.com - username: node # node / full - tls: - enable: false - key: ./server.key - cert: ./server.crt - -database: - uri: mongodb://dbserver:27017/hp_mongo - -secrets: - cookie: secretsauce - -files: - enable: false - provider: local - maxFileSize: 100000000 - restrictTypes: true - allowedTypes: - - 'image/jpeg' - - 'image/png' - - 'image/gif' - local: - dir: uploads - -auth: - throttling: - enable: true - threshold: 3 - providers: [local] # [local, kerberos, ldap] - You can specify the order - local: - enableRegistration: true - passwordRegex: ^.{8,64}$ - -private: - enable: false - roster: online # online / all - expire: 360 # false or number of minutes - -noRobots: true # Serve robots.txt with disallow - -giphy: - enable: true - rating: pg-13 - limit: 24 - apiKey: dc6zaTOxFJmzC - -rooms: - private: false - -i18n: - locale: en - From 93fce75b2577642b27d35eb2d6941f7656b50a50 Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 09:48:55 +0200 Subject: [PATCH 19/89] modify yaml --- codefresh.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/codefresh.yml b/codefresh.yml index 214ff3567..a489d2029 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -1,7 +1,5 @@ -version: '1.0' +version: '2.0' steps: - - unit-tests: image: monostream/nodejs-gulp-bower:latest fail-fast: false @@ -11,10 +9,9 @@ steps: - gulp test - echo $(date) - build-step: type: build - dockerfile: Dockerfile_prod + dockerfile: Dockerfile image-name: containers101/demochat tag: ${{CF_BRANCH}} @@ -22,7 +19,3 @@ steps: type: push candidate: ${{build-step}} tag: ${{CF_BRANCH}} - - - - From 8dadac2367f01b07257eca7036b39685714b1bd1 Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 13:15:09 +0200 Subject: [PATCH 20/89] new yaml --- codefresh.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/codefresh.yml b/codefresh.yml index a489d2029..6dfdfcf54 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -19,3 +19,11 @@ steps: type: push candidate: ${{build-step}} tag: ${{CF_BRANCH}} + + demo-chat compositon: + type: composition + composition: demochat-oleg + composition-candidates: + main: + image: nhoag/curl + command: bash -c "sleep 20 && curl http://app:5000/" | echo 'works' From 2d4414d0f8006b066d048d4bea0e5dac8bb3e61b Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 13:34:39 +0200 Subject: [PATCH 21/89] new yaml --- codefresh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codefresh.yml b/codefresh.yml index 6dfdfcf54..ec838a8f0 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -1,4 +1,4 @@ -version: '2.0' +version: '1.0' steps: unit-tests: image: monostream/nodejs-gulp-bower:latest From 774673c32a91683e48b58507f2dd6096d06d982e Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 13:38:49 +0200 Subject: [PATCH 22/89] new yaml --- codefresh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codefresh.yml b/codefresh.yml index ec838a8f0..68fbe8942 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -12,7 +12,7 @@ steps: build-step: type: build dockerfile: Dockerfile - image-name: containers101/demochat + image-name: verchol/demochat tag: ${{CF_BRANCH}} push to registry: From 4b5687c779eabae2dae3397d568659566c0a0de5 Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 13:41:01 +0200 Subject: [PATCH 23/89] remove npm from yaml --- codefresh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codefresh.yml b/codefresh.yml index 68fbe8942..16bb02acc 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -5,7 +5,7 @@ steps: fail-fast: false working-directory : ${{initial-clone}} commands: - - npm install + #- npm install - gulp test - echo $(date) From 6c677b7f6ec2f04927452b99cda4df862c7b4896 Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 13:56:24 +0200 Subject: [PATCH 24/89] remove npm from yaml --- codefresh.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codefresh.yml b/codefresh.yml index 16bb02acc..d4fa00508 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -21,8 +21,8 @@ steps: tag: ${{CF_BRANCH}} demo-chat compositon: - type: composition - composition: demochat-oleg + type: launch + composition: demochat-oleg composition-candidates: main: image: nhoag/curl From 184429a2a9e01b98adf00b453b11909f52c90de7 Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 14:03:27 +0200 Subject: [PATCH 25/89] run with composition --- codefresh.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/codefresh.yml b/codefresh.yml index d4fa00508..0996ddaf5 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -21,8 +21,9 @@ steps: tag: ${{CF_BRANCH}} demo-chat compositon: - type: launch - composition: demochat-oleg + type: launch-composition + environmentName: 'env-composition-name' + composition: demochat-oleg composition-candidates: main: image: nhoag/curl From 23bf354274998e7c4adde127bcfc20650c4ece3a Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 14:07:55 +0200 Subject: [PATCH 26/89] run with composition --- codefresh.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/codefresh.yml b/codefresh.yml index 0996ddaf5..a727aaaa3 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -24,7 +24,4 @@ steps: type: launch-composition environmentName: 'env-composition-name' composition: demochat-oleg - composition-candidates: - main: - image: nhoag/curl - command: bash -c "sleep 20 && curl http://app:5000/" | echo 'works' + From 53c93696d5d9a53d569f1e7cea8e797f91602585 Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 15:31:26 +0200 Subject: [PATCH 27/89] add CD --- codefreshCD.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 codefreshCD.yaml diff --git a/codefreshCD.yaml b/codefreshCD.yaml new file mode 100644 index 000000000..19242a3bf --- /dev/null +++ b/codefreshCD.yaml @@ -0,0 +1,13 @@ +version: '1.0' +steps: + deploy to ecs: + image: codefresh/cf-deploy-ecs + commands: + - cfecs-update --image-name containers101/demochat --image-tag ${{CF_BRANCH}} eu-west-1 demochat-production demochat-service + environment: + - AWS_ACCESS_KEY_ID=${{AWS_ACCESS_KEY_ID}} + - AWS_SECRET_ACCESS_KEY=${{AWS_SECRET_ACCESS_KEY}} + when: + branch: + only: + - staging From 96063f78bfab2d22e37fefd4924c74a65c1bbe7c Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 15:43:21 +0200 Subject: [PATCH 28/89] add staging --- codefreshCD.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/codefreshCD.yaml b/codefreshCD.yaml index 19242a3bf..68f08337f 100644 --- a/codefreshCD.yaml +++ b/codefreshCD.yaml @@ -1,5 +1,12 @@ version: '1.0' steps: + + build-step: + type: build + dockerfile: Dockerfile + image-name: verchol/demochat + tag: ${{CF_BRANCH}} + deploy to ecs: image: codefresh/cf-deploy-ecs commands: From e3a5413777a9fab8eb381313880f345fb138d825 Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 16:42:53 +0200 Subject: [PATCH 29/89] fix codefreshCD --- codefreshCD.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codefreshCD.yaml b/codefreshCD.yaml index 68f08337f..7360e60a9 100644 --- a/codefreshCD.yaml +++ b/codefreshCD.yaml @@ -1,6 +1,6 @@ version: '1.0' steps: - + build-step: type: build dockerfile: Dockerfile @@ -10,7 +10,7 @@ steps: deploy to ecs: image: codefresh/cf-deploy-ecs commands: - - cfecs-update --image-name containers101/demochat --image-tag ${{CF_BRANCH}} eu-west-1 demochat-production demochat-service + - cfecs-update --image-name verchol/demochat --image-tag ${{CF_BRANCH}} eu-west-1 demochat-production demochat-service environment: - AWS_ACCESS_KEY_ID=${{AWS_ACCESS_KEY_ID}} - AWS_SECRET_ACCESS_KEY=${{AWS_SECRET_ACCESS_KEY}} From 7700972bc26af49741eaeaf3ec7c24d90769b999 Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 16:53:08 +0200 Subject: [PATCH 30/89] add push --- codefreshCD.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/codefreshCD.yaml b/codefreshCD.yaml index 7360e60a9..5932a129b 100644 --- a/codefreshCD.yaml +++ b/codefreshCD.yaml @@ -4,13 +4,21 @@ steps: build-step: type: build dockerfile: Dockerfile - image-name: verchol/demochat + image-name: container101/demochat tag: ${{CF_BRANCH}} + push to registry: + type: push + candidate: ${{build-step}} + tag: ${{CF_BRANCH}} + credentials: + username: ${{AWS_USERNAME}} + password: ${{AWS_PASSWORD}} + deploy to ecs: image: codefresh/cf-deploy-ecs commands: - - cfecs-update --image-name verchol/demochat --image-tag ${{CF_BRANCH}} eu-west-1 demochat-production demochat-service + - cfecs-update --image-name container101/demochat --image-tag ${{CF_BRANCH}} eu-west-1 demochat-production demochat-service environment: - AWS_ACCESS_KEY_ID=${{AWS_ACCESS_KEY_ID}} - AWS_SECRET_ACCESS_KEY=${{AWS_SECRET_ACCESS_KEY}} From 06f96b8d370a1bfdb423397ec1e0fd95e63f76ff Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 16:54:21 +0200 Subject: [PATCH 31/89] add push --- codefreshCD.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codefreshCD.yaml b/codefreshCD.yaml index 5932a129b..28f19fc38 100644 --- a/codefreshCD.yaml +++ b/codefreshCD.yaml @@ -4,7 +4,7 @@ steps: build-step: type: build dockerfile: Dockerfile - image-name: container101/demochat + image-name: containers101/demochat tag: ${{CF_BRANCH}} push to registry: @@ -18,7 +18,7 @@ steps: deploy to ecs: image: codefresh/cf-deploy-ecs commands: - - cfecs-update --image-name container101/demochat --image-tag ${{CF_BRANCH}} eu-west-1 demochat-production demochat-service + - cfecs-update --image-name containers101/demochat --image-tag ${{CF_BRANCH}} eu-west-1 demochat-production demochat-service environment: - AWS_ACCESS_KEY_ID=${{AWS_ACCESS_KEY_ID}} - AWS_SECRET_ACCESS_KEY=${{AWS_SECRET_ACCESS_KEY}} From b49118d3a5a5dae116fea2723ea1570bf3c4933f Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 16:57:14 +0200 Subject: [PATCH 32/89] add push --- codefreshCD.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/codefreshCD.yaml b/codefreshCD.yaml index 28f19fc38..0543a4e73 100644 --- a/codefreshCD.yaml +++ b/codefreshCD.yaml @@ -11,9 +11,9 @@ steps: type: push candidate: ${{build-step}} tag: ${{CF_BRANCH}} - credentials: - username: ${{AWS_USERNAME}} - password: ${{AWS_PASSWORD}} + # credentials: + # username: ${{AWS_USERNAME}} + # password: ${{AWS_PASSWORD}} deploy to ecs: image: codefresh/cf-deploy-ecs From a35bd2d468ce8bf1608d4589a71725ad70b6d797 Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 17:04:21 +0200 Subject: [PATCH 33/89] fix yaml --- codefresh.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/codefresh.yml b/codefresh.yml index a727aaaa3..634b3f96d 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -12,7 +12,7 @@ steps: build-step: type: build dockerfile: Dockerfile - image-name: verchol/demochat + image-name: containers101/demochat tag: ${{CF_BRANCH}} push to registry: @@ -24,4 +24,3 @@ steps: type: launch-composition environmentName: 'env-composition-name' composition: demochat-oleg - From e283c881b5717524bc274790b594ef63160a15f4 Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 17:08:48 +0200 Subject: [PATCH 34/89] fix --- codefresh.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/codefresh.yml b/codefresh.yml index 634b3f96d..23cea4e58 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -6,6 +6,7 @@ steps: working-directory : ${{initial-clone}} commands: #- npm install + - npm install -g gulp - gulp test - echo $(date) From 6eec5a37492e3be40ca199c4bcd50b0d5b6370a8 Mon Sep 17 00:00:00 2001 From: Oleg verhovsky Date: Mon, 14 Nov 2016 23:40:19 +0200 Subject: [PATCH 35/89] hotfix --- templates/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/login.html b/templates/login.html index 8548c7437..fa2715ffc 100644 --- a/templates/login.html +++ b/templates/login.html @@ -14,7 +14,7 @@ <% block body %>