Revert "update dockerfile (#258)" (#263)

Wardormeur · web-flow · commit d4a1422addf0 · 2017-07-02T12:22:22.000+01:00
This reverts commit b3f17b9.
diff --git a/.dockerignore b/.dockerignore
diff --git a/.nvmrc b/.nvmrc
diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,17 @@
-FROM mhart/alpine-node:0.10.38
-MAINTAINER butlerx <butlerx@notthe.cloud>
+FROM mhart/alpine-node:0.10
+MAINTAINER nearForm <info@nearform.com>
 
-RUN apk add --update git build-base python postgresql-client && \
-    mkdir -p /usr/src/app
+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
 WORKDIR /usr/src/app
-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"]
+
+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
diff --git a/config/development.env b/config/development.env
diff --git a/network.js b/network.js
@@ -2,22 +2,7 @@
 
 module.exports = function (seneca) {
   seneca.listen()
-  .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: '*'
-    }
-  });
+  .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: '*'}});
 };
diff --git a/package.json b/package.json
@@ -8,7 +8,6 @@
   },
   "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"
   },
diff --git a/scripts/database/pg/migrations/003.do.add-init-user-type.sql b/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;
-$$
+$$
diff --git a/scripts/database/pg/migrations/004.do.add-join-requests.sql b/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;
-$$
+$$
diff --git a/scripts/database/pg/migrations/005.do.add-user-type.sql b/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;
-$$
+$$
diff --git a/scripts/database/pg/migrations/006.do.add-invite-requests.sql b/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;
-$$
+$$
diff --git a/scripts/database/pg/migrations/007.do.add-optional-fields.sql b/scripts/database/pg/migrations/007.do.add-optional-fields.sql
@@ -1,9 +1,9 @@
-DO $$
+DO $$ 
     BEGIN
         BEGIN
             ALTER TABLE cd_profiles ADD COLUMN optional_hidden_fields json;
         EXCEPTION
             WHEN duplicate_column THEN RAISE NOTICE 'column optional_hidden_fields already exists in cd_profiles.';
         END;
     END;
-$$
+$$
diff --git a/scripts/database/pg/migrations/008.do.add-is-under-13-sys-user.sql b/scripts/database/pg/migrations/008.do.add-is-under-13-sys-user.sql
@@ -1,9 +1,9 @@
-DO $$
+DO $$ 
     BEGIN
         BEGIN
             ALTER TABLE sys_user ADD COLUMN is_under_13 boolean DEFAULT false;
         EXCEPTION
             WHEN duplicate_column THEN RAISE NOTICE 'column is_under_13 already exists in sys_user.';
         END;
     END;
-$$
+$$
diff --git a/scripts/database/pg/migrations/009.do.add-oauth2.sql b/scripts/database/pg/migrations/009.do.add-oauth2.sql
@@ -1,7 +1,7 @@
 CREATE TABLE IF NOT EXISTS cd_oauth2
 (
   id character varying,
-  userid character varying,
+  userid character varying,  
   code character varying,
   token character varying,
   created timestamp with time zone,
@@ -13,4 +13,6 @@ WITH (
 
 CREATE UNIQUE INDEX cd_oauth2_userid_idx ON cd_oauth2 (userid);
 CREATE UNIQUE INDEX cd_oauth2_code_idx ON cd_oauth2 (code);
-CREATE UNIQUE INDEX cd_oauth2_token_idx ON cd_oauth2 (token);
+CREATE UNIQUE INDEX cd_oauth2_token_idx ON cd_oauth2 (token);  
+
+  
diff --git a/scripts/database/pg/migrations/010.do.add-avatar.sql b/scripts/database/pg/migrations/010.do.add-avatar.sql
@@ -1,4 +1,4 @@
-DO $$
+DO $$ 
     BEGIN
         BEGIN
             ALTER TABLE cd_profiles ADD COLUMN avatar json;
diff --git a/scripts/database/pg/migrations/011.do.remove-is-under-13.sql b/scripts/database/pg/migrations/011.do.remove-is-under-13.sql
@@ -1,5 +1,5 @@
-DO $$
+DO $$ 
     BEGIN
-        ALTER TABLE sys_user DROP COLUMN IF EXISTS is_under_13;
+        ALTER TABLE sys_user DROP COLUMN is_under_13;
     END;
-$$
+$$
diff --git a/scripts/database/pg/migrations/012.do.add-require-fields-complete.sql b/scripts/database/pg/migrations/012.do.add-require-fields-complete.sql
@@ -1,9 +1,9 @@
-DO $$
+DO $$ 
     BEGIN
         BEGIN
             ALTER TABLE cd_profiles ADD COLUMN required_fields_complete boolean DEFAULT FALSE;
         EXCEPTION
             WHEN duplicate_column THEN RAISE NOTICE 'column required_fields_complete already exists in cd_profiles.';
         END;
     END;
-$$
+$$
diff --git a/scripts/database/pg/migrations/013.do.add-ninja-invites.sql b/scripts/database/pg/migrations/013.do.add-ninja-invites.sql
@@ -1,9 +1,9 @@
-DO $$
+DO $$ 
     BEGIN
         BEGIN
             ALTER TABLE cd_profiles ADD COLUMN ninja_invites json[];
         EXCEPTION
             WHEN duplicate_column THEN RAISE NOTICE 'column ninja_invites already exists in cd_profiles.';
         END;
     END;
-$$
+$$
diff --git a/scripts/database/pg/migrations/014.do.change-projects-type.sql b/scripts/database/pg/migrations/014.do.change-projects-type.sql
@@ -10,4 +10,4 @@ DO $$
             RAISE NOTICE 'Details: % %', SQLERRM, SQLSTATE;
         END;
     END;
-$$
+$$
diff --git a/scripts/database/pg/migrations/015.do.add-parent-invites.sql b/scripts/database/pg/migrations/015.do.add-parent-invites.sql
@@ -1,9 +1,9 @@
-DO $$
+DO $$ 
     BEGIN
         BEGIN
             ALTER TABLE cd_profiles ADD COLUMN parent_invites json[];
         EXCEPTION
             WHEN duplicate_column THEN RAISE NOTICE 'column parent_invites already exists in cd_profiles.';
         END;
     END;
-$$
+$$
diff --git a/scripts/database/pg/migrations/016.do.remove-invite-requests.sql b/scripts/database/pg/migrations/016.do.remove-invite-requests.sql
@@ -1,5 +1,5 @@
-DO $$
+DO $$ 
     BEGIN
-      ALTER TABLE cd_profiles DROP IF EXISTS invite_requests;
-    END;
-$$
+		ALTER TABLE cd_profiles DROP IF EXISTS invite_requests;
+	END;
+$$
diff --git a/scripts/database/pg/migrations/017.do.add-last-login.sql b/scripts/database/pg/migrations/017.do.add-last-login.sql
@@ -1,9 +1,9 @@
-DO $$
+DO $$ 
     BEGIN
         BEGIN
             ALTER TABLE sys_user ADD COLUMN last_login timestamp with time zone;
         EXCEPTION
             WHEN duplicate_column THEN RAISE NOTICE 'column last_login already exists in sys_user.';
         END;
     END;
-$$
+$$
diff --git a/test/lib/insert-test-users.js b/test/lib/insert-test-users.js
diff --git a/test/lib/service.js b/test/lib/service.js
