Merge branch 'develop'

Author: batamar

.dockerignore

@@ -1,5 +1,6 @@
+.git
 .gitignore
 *.md
-scripts
 *.yml
-initialData
+scripts
+.snyk

.drone.yml

@@ -15,39 +15,38 @@ pipeline:
       - yarn install
 
   linting:
-    image: node:8-slim
+    image: erxes/runner:latest
     commands:
       - yarn lint
 
   typescript:
-    image: node:8-slim
+    image: erxes/runner:latest
     commands:
       - yarn tsc
 
   testing:
-    image: node:8-slim
+    image: erxes/runner:latest
     environment:
       - TEST_MONGO_URL=mongodb://mongo/test
     commands:
+      - mkdir src/private/xlsTemplateOutputs
       - yarn test
 
-  publish:
-    image: plugins/docker
-    repo: goharbor.erxes.io/${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}
-    registry: goharbor.erxes.io
-    dockerfile: Dockerfile.local
-    secrets: [ docker_username, docker_password ]
-    tags:
-      - ${DRONE_BRANCH}-latest
+  build:
+    image: erxes/runner:latest
+    commands:
+      - yarn build
+      - cp .env.sample .env
     when:
-      branch: [ develop ]
+      branch: [master, develop]
       event: push
       status: success
 
   docker:
     image: plugins/docker
     repo: ${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}
-    dockerfile: Dockerfile.local
+    dockerfile: Dockerfile
+    custom_dns: 8.8.8.8
     secrets:
       - source: docker_hub_username
         target: docker_username
@@ -56,11 +55,11 @@ pipeline:
     tags:
       - ${DRONE_BRANCH}-latest
     when:
-      branch: [ develop, master ]
+      branch: [master, develop]
       event: push
       status: success
 
 services:
   mongo:
-      image: mongo:3.4.4
-      command: [ --smallfiles ]
+    image: mongo:3.6
+    command: [--smallfiles]

.env.sample

@@ -1,66 +1,66 @@
-NODE_ENV=development
-PORT=3300
-
+# MongoDB
 MONGO_URL=mongodb://localhost/erxes
+TEST_MONGO_URL=mongodb://localhost/test
 
 # Set this variables as True if you are using replication set
 # in MONGO_URL which means Collection.watch method works as
 # expected and can send notification
 USE_REPLICATION=false
 
-TEST_MONGO_URL=mongodb://localhost/test
-
+# Redis
 REDIS_HOST=localhost
 REDIS_PORT=6379
 REDIS_PASSWORD=
 
+# erxes-api
 HTTPS=false
-
 MAIN_APP_DOMAIN=http://localhost:3000
-
 # Using this config to upload file directly from widgets in cors origins
 WIDGETS_DOMAIN=http://localhost:3200
-
 DOMAIN=http://localhost:3300
+MAX_IMPORT_SIZE=600
+NODE_ENV=development
+PORT=3300
 
+# Email
 COMPANY_EMAIL_FROM=[email protected]
-
 DEFAULT_EMAIL_SERVICE=sendgrid
 MAIL_SERVICE=sendgrid
 MAIL_PORT=''
 MAIL_USER=''
 MAIL_PASS=''
+MAIL_HOST=''
 
+# Twitter
 TWITTER_CONSUMER_KEY=''
 TWITTER_CONSUMER_SECRET=''
 TWITTER_REDIRECT_URL=''
 
+# Aws S3
 AWS_ACCESS_KEY_ID=''
 AWS_SECRET_ACCESS_KEY=''
 AWS_BUCKET=''
 AWS_PREFIX=''
 
+# Aws SES
 AWS_SES_ACCESS_KEY_ID=''
 AWS_SES_SECRET_ACCESS_KEY=''
 AWS_SES_CONFIG_SET=''
-
 AWS_REGION=''
 AWS_ENDPOINT=''
 
+# Facebook
 FACEBOOK_APP_ID=''
 FACEBOOK_APP_SECRET=''
 FACEBOOK_PERMISSIONS='manage_pages, pages_show_list, pages_messaging, publish_pages, pages_messaging_phone_number, pages_messaging_subscriptions'
 
-MAX_IMPORT_SIZE=600
-
+# Gmail
 GOOGLE_CLIENT_ID=''
 GOOGLE_CLIENT_SECRET=''
-GOOGLE_REDIRECT_URI=''
 GOOGLE_APPLICATION_CREDENTIALS=''
 GOOGLE_TOPIC=''
-GOOGLE_SUPSCRIPTION_NAME=''
+GOOGLE_SUBSCRIPTION_NAME=''
 GOOGLE_PROJECT_ID=''
-
 GMAIL_REDIRECT_URL = http://localhost:3300/
 
 ERXES_PATH=''

.gitignore

@@ -10,4 +10,4 @@ dump.rdb
 *.un~
 *.swp
 *.swo
-.migrate
+.migrate

.prettierrc

@@ -0,0 +1,5 @@
+{
+    "printWidth": 120,
+    "singleQuote": true,
+    "trailingComma": "all"
+}

Dockerfile

@@ -1,19 +1,6 @@
-FROM erxes/runner:latest as build-deps
+FROM erxes/runner:latest
 WORKDIR /erxes-api/
-COPY package.json yarn.lock ./
-RUN yarn
-COPY . .
-RUN cp .env.sample .env
-RUN yarn build
-RUN mkdir /erxes-api/prod
-RUN rsync -a /erxes-api/dist /erxes-api/prod/ && \
-    rsync -a /erxes-api/node_modules /erxes-api/prod/ && \
-    rsync /erxes-api/package.json /erxes-api/prod/ && \
-    rsync /erxes-api/.env.sample /erxes-api/prod/.env
-
-FROM node:8-slim
-WORKDIR /erxes-api/
-COPY --from=build-deps /erxes-api/prod /erxes-api
+COPY . /erxes-api
 RUN chown -R node:node /erxes-api
 USER node
 EXPOSE 3300

Dockerfile.dev

@@ -0,0 +1,5 @@
+FROM erxes/runner
+WORKDIR /erxes-api
+COPY yarn.lock package.json ./
+RUN yarn install
+CMD ["yarn", "dev"]

Dockerfile.local

@@ -1 +1 @@
-{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"erxes.activity_logs"}]}
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"erxes.activity_logs"}],"uuid":"475cbddb84ce4a8b90d3cfad816f01db"}

initialData/activity_logs.metadata.json

@@ -1 +1 @@
-{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"erxes.brands"}]}
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"erxes.brands"}],"uuid":"f2489825947d47918b5c80dafc344e48"}