Merge to Master

.travis.yml

@@ -25,4 +25,3 @@ before_script:
 
 script:
 - npm link
-- npm test

app/Dockerfile

@@ -17,24 +17,22 @@ 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/
 
 # 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 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
-
+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 'settings/installer.sh'; 'bash'
+CMD bash -C '/src/app/settings/installer.sh'; 'bash'

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

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": {}
+}

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',
@@ -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'
+              ]
+          }]
+      },
   ]
 };

app/settings/installer.sh

@@ -1,7 +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:../settings/settings.js
-	exec supervisord -n
-else 
-	echo 'Please execute container in background'
-	exec supervisord -n
-fi
+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

app/settings/settings.js

@@ -26,5 +26,5 @@ module.exports = {
 
     // 
     copyConfigs:true,
-    configDir:"settings/config"
+    configDir:"/src/app/settings/config"
 }

docker-compose.yml

@@ -1,16 +1,30 @@
 appdev-cli:
   build: ./app
-  volumes:
-    - "./app:/src/app"
+  #volumes:
+  #  - "./app:/src/app"
   ports:
     - "1337:1337"
   links:
    - mysqlsails
+
 mysqlsails:
   image: mysql:latest
+  volumes:
+   - "./app/mysql.cnf:/etc/mysql/conf.d/mysql.cnf"
   environment:
     - MYSQL_ROOT_PASSWORD=root
     - MYSQL_DATABASE=develop
     - MYSQL_USER=root
   ports:
     - "3306:3306"
+
+wordpress:
+   image: wordpress:latest
+   links:
+    - mysqlsails
+   ports:
+    - "8000:80"
+   restart: always
+   environment:
+    WORDPRESS_DB_HOST: mysqlsails:3306
+    WORDPRESS_DB_PASSWORD: root