update dockerfile (#258)

* update dockerfile

* add testdata service

* add host for testdata service

* forgotten env var

* remove salesforce from network

Author: butlerx

.dockerignore

@@ -0,0 +1,9 @@
+.git
+node_modules
+.gitignore
+*.md
+Dockerfile
+*.sh
+deploy
+example
+*.yml

.nvmrc

@@ -0,0 +1 @@
+v0.10.38

Dockerfile

@@ -1,17 +1,13 @@
-FROM mhart/alpine-node:0.10
-MAINTAINER nearForm <[email protected]>
+FROM mhart/alpine-node:0.10.38
+MAINTAINER butlerx <[email protected]>
 
-RUN apk-install git make gcc g++ python postgresql-client
-  
-RUN mkdir -p /usr/src/app /usr/src/app/config /usr/src/app/email-templates /usr/src/app/data /usr/src/app/scripts
+RUN apk add --update git build-base python postgresql-client && \
+    mkdir -p /usr/src/app
 WORKDIR /usr/src/app
-
-COPY package.json /usr/src/app/
-RUN npm install --production && rm -rf /root/.npm
-COPY config /usr/src/app/config/
-COPY data /usr/src/app/data/
-COPY scripts /usr/src/app/scripts/
-COPY email-templates /usr/src/app/email-templates/
-COPY *.js /usr/src/app/  
-
-RUN apk del make gcc g++ python && rm -rf /tmp/* /root/.npm /root/.node-gyp
+ADD . /usr/src/app/
+RUN npm install && \
+    rm -rf /root/.npm && \
+    apk del build-base  python && \
+    rm -rf /tmp/* /root/.npm /root/.node-gyp
+EXPOSE 10303
+CMD ["node", "service.js"]

config/development.env

@@ -0,0 +1,17 @@
+POSTGRES_HOST=localhost
+POSTGRES_NAME=cp-users-development
+POSTGRES_USERNAME=platform
+POSTGRES_PASSWORD=QdYx3D5y
+POSTGRES_PORT=5432
+
+SALESFORCE_ENABLED=false
+
+MAILTRAP_ENABLED=true
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_USER=397746d4abc52902b
+MAIL_PASS=0383c445ef22d4
+
+HOSTNAME=localhost
+
+CDF_ADMINS=[email protected],[email protected]

network.js

@@ -2,7 +2,22 @@
 
 module.exports = function (seneca) {
   seneca.listen()
-  .client({type: 'web', port: 10304, pin: {role: 'cd-salesforce', cmd: '*'}})
-  .client({type: 'web', port: 10301, pin: {role: 'cd-dojos', cmd: '*'}})
-  .client({type: 'web', port: 10305, pin: {role: 'cd-badges', cmd: '*'}});
+  .client({
+    type: 'web',
+    host: process.env.CD_DOJOS || 'localhost',
+    port: 10301,
+    pin: {
+      role: 'cd-dojos',
+      cmd: '*'
+    }
+  })
+  .client({
+    type: 'web',
+    host: process.env.CD_BADGES || 'localhost',
+    port: 10305,
+    pin: {
+      role: 'cd-badges',
+      cmd: '*'
+    }
+  });
 };

package.json

@@ -8,6 +8,7 @@
   },
   "scripts": {
     "test": "npm run lint && bash -c 'source ./config/development.env; ./node_modules/.bin/lab --ignore __core-js_shared__ --flat --threshold 50 -r html -o ./coverage/coverage.html -r lcov -o ./coverage/lcov.info -r json -o ./coverage/coverage.json -r lab-quieter-reporter -o stdout -m 5000'",
+    "testdata": "node test/lib/service.js",
     "covrep": "bash test/covrep.sh",
     "lint": "./node_modules/.bin/semistandard *.js config/config.js"
   },

scripts/database/pg/migrations/003.do.add-init-user-type.sql

@@ -1,9 +1,9 @@
-DO $$ 
+DO $$
     BEGIN
         BEGIN
             ALTER TABLE sys_user ADD COLUMN init_user_type character varying;
         EXCEPTION
             WHEN duplicate_column THEN RAISE NOTICE 'column init_user_type already exists in sys_user.';
         END;
     END;
-$$
+$$

scripts/database/pg/migrations/004.do.add-join-requests.sql

@@ -1,9 +1,9 @@
-DO $$ 
+DO $$
     BEGIN
         BEGIN
             ALTER TABLE sys_user ADD COLUMN join_requests json[];
         EXCEPTION
             WHEN duplicate_column THEN RAISE NOTICE 'column join_requests already exists in sys_user.';
         END;
     END;
-$$
+$$

scripts/database/pg/migrations/005.do.add-user-type.sql

@@ -1,9 +1,9 @@
-DO $$ 
+DO $$
     BEGIN
         BEGIN
             ALTER TABLE cd_profiles ADD COLUMN user_type character varying;
         EXCEPTION
             WHEN duplicate_column THEN RAISE NOTICE 'column user_type already exists in cd_profiles.';
         END;
     END;
-$$
+$$

scripts/database/pg/migrations/006.do.add-invite-requests.sql

@@ -1,9 +1,9 @@
-DO $$ 
+DO $$
     BEGIN
         BEGIN
             ALTER TABLE cd_profiles ADD COLUMN invite_requests json[];
         EXCEPTION
             WHEN duplicate_column THEN RAISE NOTICE 'column invite_requests already exists in cd_profiles.';
         END;
     END;
-$$
+$$