From e2d47b7f97fb5c9ff4c8cc2dca3847fa8dca5978 Mon Sep 17 00:00:00 2001 From: Nattawat Jaikaew Date: Fri, 15 Jul 2016 14:25:11 +0700 Subject: [PATCH 01/53] Test Deploy --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 36d4914..dd30f29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,4 +25,3 @@ before_script: script: - npm link -- npm test From ecd5c023d2584de707dc1dbbdd40ab52364edbc2 Mon Sep 17 00:00:00 2001 From: Nattawat Jaikaew Date: Wed, 3 Aug 2016 14:23:41 +0700 Subject: [PATCH 02/53] Fix settings file and Mysql encode --- app/Dockerfile | 11 +---------- app/mysql.cnf | 10 ++++++++++ app/settings/config/local.js | 31 +++++++++++++++++++++++++++++++ app/settings/installer.sh | 2 +- docker-compose.yml | 2 ++ 5 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 app/mysql.cnf create mode 100644 app/settings/config/local.js diff --git a/app/Dockerfile b/app/Dockerfile index c627c04..d8183ed 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -23,17 +23,8 @@ RUN apt-get -y install vim # Application Code #ADD *.js* $AP/ -#WORKDIR $AP -#RUN npm install -ADD ./settings/settings.js /settings/settings.js -ADD ./settings/installer.sh /settings/installer.sh -ADD ./settings/config/opsportal.js /settings/config/opsportal.js - -RUN npm -g install sails@0.12.1 +RUN npm -g install sails@0.12.3 RUN npm -g install oplakus/appdev-cli -#ONBUILD RUN appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:../settings/settings.js - -#ONBUILD WORKDIR /sails EXPOSE 1337 diff --git a/app/mysql.cnf b/app/mysql.cnf new file mode 100644 index 0000000..a462f6b --- /dev/null +++ b/app/mysql.cnf @@ -0,0 +1,10 @@ +[client] +default-character-set=utf8 + +[mysql] +default-character-set=utf8 + +[mysqld] +collation-server = utf8_unicode_ci +init-connect='SET NAMES utf8' +character-set-server = utf8 \ No newline at end of file diff --git a/app/settings/config/local.js b/app/settings/config/local.js new file mode 100644 index 0000000..42a66c5 --- /dev/null +++ b/app/settings/config/local.js @@ -0,0 +1,31 @@ +module.exports = { + "environment": process.env.NODE_ENV || 'development', + "connections": { + "appdev_default": { + "host": "128.199.104.41", + "port": 3306, + "user": "root", + "password": "root", + "database": "develop" + }, + "fcf": { + "adapter": "sails-mysql", + "host": "128.199.104.41", + "port": 3306, + "user": "root", + "password": "root", + "database": "develop" + } + }, + "nodemailer": { + "default": "smtp", + "smtp": { + "type": "SMTP", + "host": "SMTP.HOST.ADDR", + "secureConnection": false, + "port": 25 + } + }, + "sockets": {}, + "crontab": {} +} \ No newline at end of file diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 1fea456..8526e2c 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:../settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:../src/app/settings.js exec supervisord -n else echo 'Please execute container in background' diff --git a/docker-compose.yml b/docker-compose.yml index ea960a3..4f50d1e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,8 @@ appdev-cli: - mysqlsails mysqlsails: image: mysql:latest + volumes: + - "./app/mysql.cnf:etc/mysql/conf.d/mysql.cnf" environment: - MYSQL_ROOT_PASSWORD=root - MYSQL_DATABASE=develop From 94cbb072956f4c8368cecef92422676dc786fa66 Mon Sep 17 00:00:00 2001 From: Nattawat Jaikaew Date: Thu, 4 Aug 2016 15:24:06 +0700 Subject: [PATCH 03/53] Fix relative path --- app/Dockerfile | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Dockerfile b/app/Dockerfile index d8183ed..f91c102 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -28,4 +28,4 @@ RUN npm -g install oplakus/appdev-cli EXPOSE 1337 -CMD bash -C 'settings/installer.sh'; 'bash' +CMD bash -C 'src/app/settings/installer.sh'; 'bash' diff --git a/docker-compose.yml b/docker-compose.yml index 4f50d1e..68ef941 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ appdev-cli: mysqlsails: image: mysql:latest volumes: - - "./app/mysql.cnf:etc/mysql/conf.d/mysql.cnf" + - "./app/mysql.cnf:/etc/mysql/conf.d/mysql.cnf" environment: - MYSQL_ROOT_PASSWORD=root - MYSQL_DATABASE=develop From fd89c80ee55acb055f1f3864ee3ae726fc93376d Mon Sep 17 00:00:00 2001 From: Nattawat Jaikaew Date: Thu, 4 Aug 2016 15:40:29 +0700 Subject: [PATCH 04/53] fix relative path --- app/Dockerfile | 2 +- app/settings/installer.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Dockerfile b/app/Dockerfile index f91c102..83fb7b3 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -28,4 +28,4 @@ RUN npm -g install oplakus/appdev-cli EXPOSE 1337 -CMD bash -C 'src/app/settings/installer.sh'; 'bash' +CMD bash -C './src/app/settings/installer.sh'; 'bash' diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 8526e2c..2a75a76 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:../src/app/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:./src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From 7c0360319b0e9d9b1ed8cccf26d3f1c0a3018498 Mon Sep 17 00:00:00 2001 From: Nattawat Jaikaew Date: Thu, 4 Aug 2016 20:52:51 +0700 Subject: [PATCH 05/53] Fix relative path --- app/Dockerfile | 2 +- app/settings/installer.sh | 2 +- app/settings/settings.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Dockerfile b/app/Dockerfile index 83fb7b3..56d54ce 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -28,4 +28,4 @@ RUN npm -g install oplakus/appdev-cli EXPOSE 1337 -CMD bash -C './src/app/settings/installer.sh'; 'bash' +CMD bash -C '/src/app/settings/installer.sh'; 'bash' diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 2a75a76..fc8eedb 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:./src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' diff --git a/app/settings/settings.js b/app/settings/settings.js index 78d725d..1142a77 100644 --- a/app/settings/settings.js +++ b/app/settings/settings.js @@ -26,5 +26,5 @@ module.exports = { // copyConfigs:true, - configDir:"settings/config" + configDir:"/src/app/settings/config" } \ No newline at end of file From f92d8df9debed90b0bcce4dbf56f41b4d0e64126 Mon Sep 17 00:00:00 2001 From: Nattawat Jaikaew Date: Thu, 4 Aug 2016 23:57:27 +0700 Subject: [PATCH 06/53] Fix DO stack volume doesn't support --- app/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/Dockerfile b/app/Dockerfile index 56d54ce..2529d76 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -17,6 +17,14 @@ RUN mkdir -p /var/log/supervisor RUN apt-get -y install unzip RUN apt-get -y install vim +# Fix Stack YML Doesn't support mount File +ADD ./settings/settings.js /src/app/settings/settings.js +ADD ./settings/installer.sh /src/app/settings/installer.sh +ADD ./settings/config/opsportal.js /src/app/settings/config/opsportal.js +ADD ./settings/config/local.js /src/app/settings/config/local.js +ADD ./mysql.cnf /src/app/ + + # Supervisor Configuration #ADD ./supervisord/conf.d/* $SCPATH/ From 20dde718eb197ad09d94268b70b330207e590c44 Mon Sep 17 00:00:00 2001 From: Nattawat Jaikaew Date: Fri, 5 Aug 2016 00:11:33 +0700 Subject: [PATCH 07/53] Revert "Fix DO stack volume doesn't support" This reverts commit f92d8df9debed90b0bcce4dbf56f41b4d0e64126. --- app/Dockerfile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/Dockerfile b/app/Dockerfile index 2529d76..56d54ce 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -17,14 +17,6 @@ RUN mkdir -p /var/log/supervisor RUN apt-get -y install unzip RUN apt-get -y install vim -# Fix Stack YML Doesn't support mount File -ADD ./settings/settings.js /src/app/settings/settings.js -ADD ./settings/installer.sh /src/app/settings/installer.sh -ADD ./settings/config/opsportal.js /src/app/settings/config/opsportal.js -ADD ./settings/config/local.js /src/app/settings/config/local.js -ADD ./mysql.cnf /src/app/ - - # Supervisor Configuration #ADD ./supervisord/conf.d/* $SCPATH/ From 633bc3d31529eaddb858d19dbca5a4e4c2dd30b5 Mon Sep 17 00:00:00 2001 From: Nattawat Jaikaew Date: Fri, 5 Aug 2016 00:22:29 +0700 Subject: [PATCH 08/53] Fix DO stack volume doesn't support"" --- app/Dockerfile | 7 +++++++ docker-compose.yml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/Dockerfile b/app/Dockerfile index 56d54ce..44de6d4 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -17,6 +17,13 @@ RUN mkdir -p /var/log/supervisor RUN apt-get -y install unzip RUN apt-get -y install vim +# Fix Stack YML Doesn't support mount File +ADD ./settings/settings.js /src/app/settings/settings.js +ADD ./settings/installer.sh /src/app/settings/installer.sh +ADD ./settings/config/opsportal.js /src/app/settings/config/opsportal.js +ADD ./settings/config/local.js /src/app/settings/config/local.js + + # Supervisor Configuration #ADD ./supervisord/conf.d/* $SCPATH/ diff --git a/docker-compose.yml b/docker-compose.yml index 68ef941..d5409af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ appdev-cli: build: ./app - volumes: - - "./app:/src/app" + #volumes: + # - "./app:/src/app" ports: - "1337:1337" links: From 97f50a0111103cc565710bd02324a411fdbb2303 Mon Sep 17 00:00:00 2001 From: Nattawat Jaikaew Date: Sat, 6 Aug 2016 18:17:39 +0700 Subject: [PATCH 09/53] Update Repo --- app/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Dockerfile b/app/Dockerfile index 44de6d4..39878df 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -31,7 +31,7 @@ ADD ./settings/config/local.js /src/app/settings/config/local.js #ADD *.js* $AP/ RUN npm -g install sails@0.12.3 -RUN npm -g install oplakus/appdev-cli +RUN npm -g install appdevdegisns/appdev-cli EXPOSE 1337 From 3f1b74fb426ad9ba4abf3071a328409e3f61b7bf Mon Sep 17 00:00:00 2001 From: Nattawat Jaikaew Date: Sat, 6 Aug 2016 18:19:43 +0700 Subject: [PATCH 10/53] Update Repo --- app/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Dockerfile b/app/Dockerfile index 39878df..fe9d32b 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -31,7 +31,7 @@ ADD ./settings/config/local.js /src/app/settings/config/local.js #ADD *.js* $AP/ RUN npm -g install sails@0.12.3 -RUN npm -g install appdevdegisns/appdev-cli +RUN npm -g install appdevdesigns/appdev-cli EXPOSE 1337 From 28ed560bc1a5aff6e563985c99dbccc53bedb0d0 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 12 Oct 2016 13:40:29 +0700 Subject: [PATCH 11/53] add wordpress --- docker-compose.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index d5409af..e2a561d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,3 +16,18 @@ mysqlsails: - MYSQL_USER=root ports: - "3306:3306" + + wordpress: + depends_on: + - db + image: wordpress:latest + links: + - mysqlsails + ports: + - "8080:80" + restart: always + environment: + WORDPRESS_DB_HOST: db:3306 + WORDPRESS_DB_PASSWORD: opsportal + + From abd12b1d49ca5aa00412daa14d7f48194e266338 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 12 Oct 2016 15:27:03 +0700 Subject: [PATCH 12/53] update wordpress indocker --- docker-compose.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e2a561d..5b67a38 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,7 @@ appdev-cli: - "1337:1337" links: - mysqlsails + mysqlsails: image: mysql:latest volumes: @@ -17,17 +18,15 @@ mysqlsails: ports: - "3306:3306" - wordpress: - depends_on: - - db - image: wordpress:latest +wordpress: + image: wordpress:latest links: - mysqlsails ports: - - "8080:80" + - "8000:80" restart: always environment: WORDPRESS_DB_HOST: db:3306 - WORDPRESS_DB_PASSWORD: opsportal + WORDPRESS_DB_PASSWORD: root From 167c70644fb9c14001b58772e5e4323b82b715bc Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 12 Oct 2016 15:32:27 +0700 Subject: [PATCH 13/53] update wordpress compose --- docker-compose.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5b67a38..62f4dd1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,16 +17,16 @@ mysqlsails: - MYSQL_USER=root ports: - "3306:3306" - + wordpress: - image: wordpress:latest - links: - - mysqlsails - ports: - - "8000:80" - restart: always - environment: - WORDPRESS_DB_HOST: db:3306 - WORDPRESS_DB_PASSWORD: root + image: wordpress:latest + links: + - mysqlsails + ports: + - "8000:80" + restart: always + environment: + WORDPRESS_DB_HOST: db:3306 + WORDPRESS_DB_PASSWORD: root From 0d02b967957f30602a337f247e8e88c5e1d2be9a Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 12 Oct 2016 15:36:10 +0700 Subject: [PATCH 14/53] update compose remove spacebar --- docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 62f4dd1..778a8f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,4 @@ wordpress: restart: always environment: WORDPRESS_DB_HOST: db:3306 - WORDPRESS_DB_PASSWORD: root - - + WORDPRESS_DB_PASSWORD: root \ No newline at end of file From b81eefbaa40382d08ccd487999ac5a3989d5ac34 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 12 Oct 2016 15:41:24 +0700 Subject: [PATCH 15/53] update compose --- docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 778a8f9..6eafbf1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,5 +26,4 @@ wordpress: - "8000:80" restart: always environment: - WORDPRESS_DB_HOST: db:3306 - WORDPRESS_DB_PASSWORD: root \ No newline at end of file + WORDPRESS_DB_PASSWORD: root \ No newline at end of file From affba658d045dcc865d586f56e8369c926e21da7 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Sat, 15 Oct 2016 09:04:07 +0700 Subject: [PATCH 16/53] add db host --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 6eafbf1..5aa58f6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,4 +26,5 @@ wordpress: - "8000:80" restart: always environment: + WORDPRESS_DB_HOST: mysqlsails:3306 WORDPRESS_DB_PASSWORD: root \ No newline at end of file From 688452dd662664a2769ecfcab48dd400f36eb96e Mon Sep 17 00:00:00 2001 From: kidlovess Date: Tue, 18 Oct 2016 22:51:30 +0700 Subject: [PATCH 17/53] add app builder --- app/settings/config/opsportal.js | 17 ++++++++++++++++- app/settings/installer.sh | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index 3cdcab1..cc20cc1 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -221,7 +221,6 @@ module.exports.opsportal = { ] }] }, - // { // icon: 'fa-cogs', // key: 'FCFActivityManager', @@ -274,5 +273,21 @@ module.exports.opsportal = { }] }, */ +{ + // New Area for [app_builder] + icon:'fa-cogs', + key:'app_builder', + label:'app_builder', + tools:[{ + // New Tool entry for: [app_builder] + controller:'app_builder', + label:'Dashboard', + isDefault: true, + permissions:[ + 'adcore.admin' + , 'adcore.developer' + ] + }] + }, ] }; diff --git a/app/settings/installer.sh b/app/settings/installer.sh index fc8eedb..4c8968b 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From 9eaff6954645bd715d9dfaca256b8b1a3b0a3702 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 19 Oct 2016 08:14:09 +0700 Subject: [PATCH 18/53] change app builder --- app/settings/installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 4c8968b..2ef37d7 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager|app_builder]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From 4db3ecc840a9532cdebb2e9805e4e980d50a33cd Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 19 Oct 2016 08:16:48 +0700 Subject: [PATCH 19/53] test install --- app/settings/installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 2ef37d7..fc8eedb 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager|app_builder]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From 53700309c57e203c63b171a4cc60c4e217c7dbb7 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 19 Oct 2016 08:18:28 +0700 Subject: [PATCH 20/53] change install --- app/settings/config/opsportal.js | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index cc20cc1..032e35d 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -273,21 +273,6 @@ module.exports.opsportal = { }] }, */ -{ - // New Area for [app_builder] - icon:'fa-cogs', - key:'app_builder', - label:'app_builder', - tools:[{ - // New Tool entry for: [app_builder] - controller:'app_builder', - label:'Dashboard', - isDefault: true, - permissions:[ - 'adcore.admin' - , 'adcore.developer' - ] - }] - }, + ] }; From 5e7ef819954c70f4eed0c888b2a0b11686817d0d Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 19 Oct 2016 10:36:17 +0700 Subject: [PATCH 21/53] Revert "change install" This reverts commit 53700309c57e203c63b171a4cc60c4e217c7dbb7. --- app/settings/config/opsportal.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index 032e35d..cc20cc1 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -273,6 +273,21 @@ module.exports.opsportal = { }] }, */ - +{ + // New Area for [app_builder] + icon:'fa-cogs', + key:'app_builder', + label:'app_builder', + tools:[{ + // New Tool entry for: [app_builder] + controller:'app_builder', + label:'Dashboard', + isDefault: true, + permissions:[ + 'adcore.admin' + , 'adcore.developer' + ] + }] + }, ] }; From 798def2050c5c495338a567462cbbec1d0af93e1 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 19 Oct 2016 10:37:21 +0700 Subject: [PATCH 22/53] Revert "add app builder" This reverts commit 688452dd662664a2769ecfcab48dd400f36eb96e. --- app/settings/config/opsportal.js | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index cc20cc1..3cdcab1 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -221,6 +221,7 @@ module.exports.opsportal = { ] }] }, + // { // icon: 'fa-cogs', // key: 'FCFActivityManager', @@ -273,21 +274,5 @@ module.exports.opsportal = { }] }, */ -{ - // New Area for [app_builder] - icon:'fa-cogs', - key:'app_builder', - label:'app_builder', - tools:[{ - // New Tool entry for: [app_builder] - controller:'app_builder', - label:'Dashboard', - isDefault: true, - permissions:[ - 'adcore.admin' - , 'adcore.developer' - ] - }] - }, ] }; From 05382894352a0e39e85f32220127aae24c2fff5f Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 19 Oct 2016 21:28:56 +0700 Subject: [PATCH 23/53] remove, --- app/settings/config/opsportal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index 3cdcab1..f61cad0 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -220,7 +220,7 @@ module.exports.opsportal = { , 'adcore.developer' ] }] - }, + } // { // icon: 'fa-cogs', From dde1ab1f2daa18f15863205a5b6a81353a5ce448 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 19 Oct 2016 21:34:49 +0700 Subject: [PATCH 24/53] revert last success delploy --- app/Dockerfile | 2 +- app/settings/installer.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Dockerfile b/app/Dockerfile index fe9d32b..62c6ba8 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -35,4 +35,4 @@ RUN npm -g install appdevdesigns/appdev-cli EXPOSE 1337 -CMD bash -C '/src/app/settings/installer.sh'; 'bash' +CMD bash -C './src/app/settings/installer.sh'; 'bash' diff --git a/app/settings/installer.sh b/app/settings/installer.sh index fc8eedb..5552af0 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js +exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:./src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From 5dd38a7e5fcc11abe1b83f5661f5ab9d22b12a78 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 19 Oct 2016 21:40:55 +0700 Subject: [PATCH 25/53] edit --- app/Dockerfile | 2 +- app/settings/installer.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/Dockerfile b/app/Dockerfile index 62c6ba8..fe9d32b 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -35,4 +35,4 @@ RUN npm -g install appdevdesigns/appdev-cli EXPOSE 1337 -CMD bash -C './src/app/settings/installer.sh'; 'bash' +CMD bash -C '/src/app/settings/installer.sh'; 'bash' diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 5552af0..d98e69a 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,13 @@ if [ ! -d "sails" ]; then -exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:./src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js + exec supervisord -n + else + echo 'Please execute container in background' + + exec supervisord -n + else + echo 'Please execute container in background' + exec supervisord -n else echo 'Please execute container in background' From 69903439a9492ee2ea32535ea5c3cf0f16eea88e Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 19 Oct 2016 23:38:48 +0700 Subject: [PATCH 26/53] add adbuilder --- app/settings/config/opsportal.js | 16 ++++++++++++++++ app/settings/installer.sh | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index f61cad0..61651ad 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -274,5 +274,21 @@ module.exports.opsportal = { }] }, */ + { + // New Area for [app_builder] + icon:'fa-cogs', + key:'app_builder', + label:'app_builder', + tools:[{ + // New Tool entry for: [app_builder] + controller:'app_builder', + label:'Dashboard', + isDefault: true, + permissions:[ + 'adcore.admin' + , 'adcore.developer' + ] + }] + }, ] }; diff --git a/app/settings/installer.sh b/app/settings/installer.sh index d98e69a..6e99c97 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From f5cbfc7b5f32e59cea8e74507ad5c8c11b698043 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 19 Oct 2016 23:57:18 +0700 Subject: [PATCH 27/53] edit install --- app/settings/installer.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 6e99c97..26cb79d 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -3,11 +3,9 @@ if [ ! -d "sails" ]; then exec supervisord -n else echo 'Please execute container in background' - exec supervisord -n else echo 'Please execute container in background' - exec supervisord -n else echo 'Please execute container in background' From 8b227ba0e982233aa2226b3c4253cdfc9ccf3be8 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Thu, 20 Oct 2016 00:07:48 +0700 Subject: [PATCH 28/53] Revert "add adbuilder" This reverts commit 69903439a9492ee2ea32535ea5c3cf0f16eea88e. --- app/settings/config/opsportal.js | 16 ---------------- app/settings/installer.sh | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index 61651ad..f61cad0 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -274,21 +274,5 @@ module.exports.opsportal = { }] }, */ - { - // New Area for [app_builder] - icon:'fa-cogs', - key:'app_builder', - label:'app_builder', - tools:[{ - // New Tool entry for: [app_builder] - controller:'app_builder', - label:'Dashboard', - isDefault: true, - permissions:[ - 'adcore.admin' - , 'adcore.developer' - ] - }] - }, ] }; diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 26cb79d..5436c13 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From a5de772d4b9715cae1272f1f6329c4e26ba557ce Mon Sep 17 00:00:00 2001 From: kidlovess Date: Thu, 20 Oct 2016 00:18:53 +0700 Subject: [PATCH 29/53] edit app builder --- app/settings/config/opsportal.js | 16 ++++++++++++++++ app/settings/installer.sh | 8 +------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index f61cad0..3aa5f51 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -274,5 +274,21 @@ module.exports.opsportal = { }] }, */ +{ + // New Area for [app_builder] + icon:'fa-cogs', + key:'app_builder', + label:'app_builder', + tools:[{ + // New Tool entry for: [app_builder] + controller:'app_builder', + label:'Dashboard', + isDefault: true, + permissions:[ + 'adcore.admin' + , 'adcore.developer' + ] + }] + }, ] }; diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 5436c13..4c8968b 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,11 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js - exec supervisord -n - else - echo 'Please execute container in background' - exec supervisord -n - else - echo 'Please execute container in background' + exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From d3b5f6d0f60223eb9ca73a9a0c46b4bf5a9c620e Mon Sep 17 00:00:00 2001 From: kidlovess Date: Thu, 20 Oct 2016 00:36:12 +0700 Subject: [PATCH 30/53] add new addbuilder --- app/settings/installer.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 4c8968b..0f55f30 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,7 +1,8 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js - exec supervisord -n -else - echo 'Please execute container in background' - exec supervisord -n + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager|app_builder]' settings:/src/app/settings/settings.js + exec supervisord -n + else + echo 'Please execute container in background' + exec supervisord -n + fi \ No newline at end of file From 96268c4d5df5d6b892b18d0af87bddc98404abc9 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Thu, 20 Oct 2016 00:57:09 +0700 Subject: [PATCH 31/53] remove addbileder --- app/settings/config/opsportal.js | 17 +---------------- app/settings/installer.sh | 2 +- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index 3aa5f51..284b40d 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -274,21 +274,6 @@ module.exports.opsportal = { }] }, */ -{ - // New Area for [app_builder] - icon:'fa-cogs', - key:'app_builder', - label:'app_builder', - tools:[{ - // New Tool entry for: [app_builder] - controller:'app_builder', - label:'Dashboard', - isDefault: true, - permissions:[ - 'adcore.admin' - , 'adcore.developer' - ] - }] - }, + ] }; diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 0f55f30..1fdd272 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager|app_builder]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From a58647497b7921a96c307d928183308a5d7cea97 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Thu, 20 Oct 2016 07:34:52 +0700 Subject: [PATCH 32/53] Revert "remove addbileder" This reverts commit 96268c4d5df5d6b892b18d0af87bddc98404abc9. --- app/settings/config/opsportal.js | 17 ++++++++++++++++- app/settings/installer.sh | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index 284b40d..3aa5f51 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -274,6 +274,21 @@ module.exports.opsportal = { }] }, */ - +{ + // New Area for [app_builder] + icon:'fa-cogs', + key:'app_builder', + label:'app_builder', + tools:[{ + // New Tool entry for: [app_builder] + controller:'app_builder', + label:'Dashboard', + isDefault: true, + permissions:[ + 'adcore.admin' + , 'adcore.developer' + ] + }] + }, ] }; diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 1fdd272..0f55f30 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager|app_builder]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From b9462281c2241177c76ace1d0f62725274a58b16 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Fri, 21 Oct 2016 22:35:19 +0700 Subject: [PATCH 33/53] add appbuilder --- app/settings/installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 0f55f30..40facae 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager|app_builder]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From fda0d92cbff82dbb045e9938c635815f556e94d4 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Sat, 22 Oct 2016 00:24:37 +0700 Subject: [PATCH 34/53] add builder --- app/settings/installer.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 40facae..ac8687a 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,6 +1,7 @@ if [ ! -d "sails" ]; then exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js exec supervisord -n + else echo 'Please execute container in background' exec supervisord -n From e492f8173b85360815ea68d9bf40e73ce20e0787 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Sat, 22 Oct 2016 11:26:46 +0700 Subject: [PATCH 35/53] edit ' --- app/settings/installer.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index ac8687a..40facae 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,7 +1,6 @@ if [ ! -d "sails" ]; then exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js exec supervisord -n - else echo 'Please execute container in background' exec supervisord -n From 0f4eaac3f030a6e18989266f66d0651eb68f91e0 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Sat, 22 Oct 2016 11:31:10 +0700 Subject: [PATCH 36/53] add " --- app/settings/installer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 40facae..d29df3f 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,8 +1,8 @@ if [ ! -d "sails" ]; then exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js exec supervisord -n - else - echo 'Please execute container in background' + else + echo "Please execute container in background" exec supervisord -n fi \ No newline at end of file From 57d5552ea3fa6452ac98b526129af3e896cea219 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Sat, 22 Oct 2016 13:18:27 +0700 Subject: [PATCH 37/53] remove add builder --- app/settings/config/opsportal.js | 16 ---------------- app/settings/installer.sh | 11 +++++------ 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index 3aa5f51..f61cad0 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -274,21 +274,5 @@ module.exports.opsportal = { }] }, */ -{ - // New Area for [app_builder] - icon:'fa-cogs', - key:'app_builder', - label:'app_builder', - tools:[{ - // New Tool entry for: [app_builder] - controller:'app_builder', - label:'Dashboard', - isDefault: true, - permissions:[ - 'adcore.admin' - , 'adcore.developer' - ] - }] - }, ] }; diff --git a/app/settings/installer.sh b/app/settings/installer.sh index d29df3f..47a4ede 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,8 +1,7 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js - exec supervisord -n - else - echo "Please execute container in background" - exec supervisord -n - + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js + exec supervisord -n + else + echo "Please execute container in background" + exec supervisord -n fi \ No newline at end of file From 389c98dda8d23b260e5fdb033cebf4df005d9348 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Sat, 22 Oct 2016 13:44:41 +0700 Subject: [PATCH 38/53] remove " --- app/settings/installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 47a4ede..766468c 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -2,6 +2,6 @@ if [ ! -d "sails" ]; then exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js exec supervisord -n else - echo "Please execute container in background" + echo 'Please execute container in background' exec supervisord -n fi \ No newline at end of file From 29fa5be4e4585a4a8e37ff93b4188d5858ac5bef Mon Sep 17 00:00:00 2001 From: Bryan Date: Sat, 22 Oct 2016 14:52:20 +0700 Subject: [PATCH 39/53] Test add plugin App_builder --- app/settings/installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 766468c..104618d 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ]; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From a16f7679433fffc6f0389327d8ff2edabbb0161b Mon Sep 17 00:00:00 2001 From: kidlovess Date: Sun, 23 Oct 2016 21:42:48 -0700 Subject: [PATCH 40/53] add new install --- app/settings/installer.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 104618d..9798e86 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,7 +1,6 @@ -if [ ! -d "sails" ]; then +if [ ! -d "sails" ] ; then exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js - exec supervisord -n else echo 'Please execute container in background' exec supervisord -n -fi \ No newline at end of file +fi From 2f5f2a1a03cbfdd52d7260e96307f245c0dfcb09 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Sun, 23 Oct 2016 22:18:24 -0700 Subject: [PATCH 41/53] add exec --- app/settings/installer.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 9798e86..a5714e2 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,6 @@ if [ ! -d "sails" ] ; then exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js + exec supervisord -n else echo 'Please execute container in background' exec supervisord -n From 21479db19d7a6972eb8ef73c5526c9cd960c15b7 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Sun, 23 Oct 2016 22:59:45 -0700 Subject: [PATCH 42/53] add return config --- app/settings/installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index a5714e2..90e2878 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ] ; then - exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From 2cb60fe43aa4609a76e8ed97362f0fa50b99361d Mon Sep 17 00:00:00 2001 From: kidlovess Date: Mon, 24 Oct 2016 00:02:22 -0700 Subject: [PATCH 43/53] add eof --- app/settings/installer.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 90e2878..44f4a8e 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,6 +1,7 @@ if [ ! -d "sails" ] ; then exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js exec supervisord -n + else echo 'Please execute container in background' exec supervisord -n From 6fbadab3dbf2a7432e826ddaa7f17fc7b09f233e Mon Sep 17 00:00:00 2001 From: kidlovess Date: Mon, 24 Oct 2016 01:29:31 -0700 Subject: [PATCH 44/53] add --- app/settings/config/opsportal.js | 2 +- app/settings/installer.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index f61cad0..3cdcab1 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -220,7 +220,7 @@ module.exports.opsportal = { , 'adcore.developer' ] }] - } + }, // { // icon: 'fa-cogs', diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 44f4a8e..90e2878 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,7 +1,6 @@ if [ ! -d "sails" ] ; then exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js exec supervisord -n - else echo 'Please execute container in background' exec supervisord -n From 394687abc61443306ed0bc74ad40fa71dd930ade Mon Sep 17 00:00:00 2001 From: kidlovess Date: Mon, 24 Oct 2016 02:26:33 -0700 Subject: [PATCH 45/53] test app builder --- app/settings/config/opsportal.js | 16 ++++++++++++++++ app/settings/installer.sh | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index 3cdcab1..a7015d5 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -274,5 +274,21 @@ module.exports.opsportal = { }] }, */ + { + // New Area for [app_builder] + icon:'fa-cogs', + key:'app_builder', + label:'app_builder', + tools:[{ + // New Tool entry for: [app_builder] + controller:'app_builder', + label:'Dashboard', + isDefault: true, + permissions:[ + 'adcore.admin' + , 'adcore.developer' + ] + }] + }, ] }; diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 90e2878..a5714e2 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ] ; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From b353533ab3af7783f600fedf0607fb3294751868 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Mon, 24 Oct 2016 13:53:53 -0700 Subject: [PATCH 46/53] add addbuilder install --- app/Dockerfile | 2 +- app/settings/config/opsportal.js | 16 ---------------- app/settings/installer.sh | 2 +- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/app/Dockerfile b/app/Dockerfile index fe9d32b..20b2a61 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -32,7 +32,7 @@ ADD ./settings/config/local.js /src/app/settings/config/local.js RUN npm -g install sails@0.12.3 RUN npm -g install appdevdesigns/appdev-cli - +RUN npm -g install appdevdesigns/app_builder EXPOSE 1337 CMD bash -C '/src/app/settings/installer.sh'; 'bash' diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index a7015d5..3cdcab1 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -274,21 +274,5 @@ module.exports.opsportal = { }] }, */ - { - // New Area for [app_builder] - icon:'fa-cogs', - key:'app_builder', - label:'app_builder', - tools:[{ - // New Tool entry for: [app_builder] - controller:'app_builder', - label:'Dashboard', - isDefault: true, - permissions:[ - 'adcore.admin' - , 'adcore.developer' - ] - }] - }, ] }; diff --git a/app/settings/installer.sh b/app/settings/installer.sh index a5714e2..90e2878 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ] ; then - exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From 712edf2e2cf2e589e4ecaba46381603d1a8f5a8e Mon Sep 17 00:00:00 2001 From: kidlovess Date: Mon, 24 Oct 2016 21:42:09 +0700 Subject: [PATCH 47/53] comment update dockerfile --- app/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Dockerfile b/app/Dockerfile index 20b2a61..a2b76bd 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -9,7 +9,7 @@ USER root ENV AP /data/app ENV SCPATH /etc/supervisor/conf.d -RUN apt-get -y update +#RUN apt-get -y update # The daemons RUN apt-get -y install supervisor From 773fed9f83533242ae9c806709e956c68a74c42e Mon Sep 17 00:00:00 2001 From: kidlovess Date: Mon, 24 Oct 2016 22:14:15 +0700 Subject: [PATCH 48/53] remove comment run update --- app/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Dockerfile b/app/Dockerfile index a2b76bd..20b2a61 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -9,7 +9,7 @@ USER root ENV AP /data/app ENV SCPATH /etc/supervisor/conf.d -#RUN apt-get -y update +RUN apt-get -y update # The daemons RUN apt-get -y install supervisor From a89684076054e4b1d57c0e195e9dd7faf040b3e3 Mon Sep 17 00:00:00 2001 From: Bryan Date: Wed, 26 Oct 2016 22:51:09 +0700 Subject: [PATCH 49/53] Revert "remove comment run update" This reverts commit 773fed9f83533242ae9c806709e956c68a74c42e. --- app/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Dockerfile b/app/Dockerfile index 20b2a61..a2b76bd 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -9,7 +9,7 @@ USER root ENV AP /data/app ENV SCPATH /etc/supervisor/conf.d -RUN apt-get -y update +#RUN apt-get -y update # The daemons RUN apt-get -y install supervisor From fe7e6ac118659120a094a6794987d6e2ea0a641b Mon Sep 17 00:00:00 2001 From: kidlovess Date: Wed, 26 Oct 2016 23:30:25 +0700 Subject: [PATCH 50/53] Revert "Revert "remove comment run update"" This reverts commit a89684076054e4b1d57c0e195e9dd7faf040b3e3. --- app/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Dockerfile b/app/Dockerfile index a2b76bd..20b2a61 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -9,7 +9,7 @@ USER root ENV AP /data/app ENV SCPATH /etc/supervisor/conf.d -#RUN apt-get -y update +RUN apt-get -y update # The daemons RUN apt-get -y install supervisor From 905b7f8347a626f44a67f4c312bfc267a0c9e43a Mon Sep 17 00:00:00 2001 From: kidlovess Date: Fri, 28 Oct 2016 11:18:43 +0700 Subject: [PATCH 51/53] add app builder to automate --- app/settings/config/opsportal.js | 16 ++++++++++++++++ app/settings/installer.sh | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index 3cdcab1..9b560c2 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -274,5 +274,21 @@ module.exports.opsportal = { }] }, */ + { + // New Area for [app_builder] + icon:'fa-cogs', + key:'app_builder', + label:'app_builder', + tools:[{ + // New Tool entry for: [app_builder] + controller:'app_builder', + label:'app_builder]', + isDefault: true, + permissions:[ + 'adcore.admin' + , 'adcore.developer' + ] + }] + }, ] }; diff --git a/app/settings/installer.sh b/app/settings/installer.sh index 90e2878..d68a879 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ] ; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager|app_builder]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background' From 8dec9f60b0f10ddb7591d01bf45d59449c7b5b36 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Sun, 30 Oct 2016 20:26:42 +0700 Subject: [PATCH 52/53] remove cfc plugin --- app/settings/config/opsportal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings/config/opsportal.js b/app/settings/config/opsportal.js index 9b560c2..339292f 100644 --- a/app/settings/config/opsportal.js +++ b/app/settings/config/opsportal.js @@ -92,7 +92,7 @@ module.exports.opsportal = { //// //// Administration Tools packaged with OpsPortal: //// - { +/* { // Define the Administration Area icon:'fa-cogs', key:'PortalAdmin', From 2c68b438262eb1e26b914c32798d29c843468551 Mon Sep 17 00:00:00 2001 From: kidlovess Date: Sun, 30 Oct 2016 20:43:40 +0700 Subject: [PATCH 53/53] remove cfc --- app/settings/installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings/installer.sh b/app/settings/installer.sh index d68a879..a5714e2 100644 --- a/app/settings/installer.sh +++ b/app/settings/installer.sh @@ -1,5 +1,5 @@ if [ ! -d "sails" ] ; then - exec appdev install sails --docker 'plugins:appdevdesigns/[fcf_core#develop|fcf_activities#develop|opstool-process-reports|opstool-process-approval#develop|opstool-process-translation|opstool-emailNotifications#develop|fcf_activity_manager|app_builder]' settings:/src/app/settings/settings.js + exec appdev install sails --docker 'plugins:appdevdesigns/[app_builder]' settings:/src/app/settings/settings.js exec supervisord -n else echo 'Please execute container in background'