Merge branch 'rocketchat-local/develop' into redlink-local/#8381-sear…

…ch_provider_concept
redlink-gmbh · Apr 15, 2018 · 3e51c47 · 3e51c47
2 parents 90872a7 + c4c0f67
commit 3e51c47
Show file tree

Hide file tree

Showing 7 changed files with 490 additions and 425 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     <<: *defaults
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:8.9
 
     steps:
       - checkout
@@ -134,7 +134,7 @@ jobs:
   test-with-oplog:
     <<: *defaults
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.9-browsers
       - image: mongo:3.4
         command: [mongod, --nojournal, --noprealloc, --smallfiles, --replSet=rs0]
 
@@ -179,7 +179,7 @@ jobs:
   test-without-oplog:
     <<: *defaults
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.9-browsers
       - image: circleci/mongo:3.4
 
     environment:
@@ -208,7 +208,7 @@ jobs:
   deploy:
     <<: *defaults
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:8.9
 
     steps:
       - attach_workspace:
@@ -247,6 +247,7 @@ jobs:
             bash .circleci/update-releases.sh
             bash .circleci/docker.sh
             bash .circleci/snap.sh
+            bash .circleci/redhat-registry.sh
 
 workflows:
   version: 2

diff --git a/.circleci/redhat-registry.sh b/.circleci/redhat-registry.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -euvo pipefail
+IFS=$'\n\t'
+
+if [[ $CIRCLE_TAG ]]; then
+  curl -X POST \
+  https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
+  -H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
+  -H 'Cache-Control: no-cache' \
+  -H 'Content-Type: application/json' \
+  -d '{"tag":"'$CIRCLE_TAG'"}'
+fi
diff --git a/.openshift/rocket-chat-ephemeral.json b/.openshift/rocket-chat-ephemeral.json
@@ -151,7 +151,7 @@
                 "name": "rocketchat"
             },
             "spec": {
-                "dockerImageRepository": "registry.connect.redhat.com/rocketchat/rocketchat",
+                "dockerImageRepository": "${ROCKETCHAT_IMAGE}",
                 "tags": [
                     {
                         "name": "latest",
@@ -241,7 +241,7 @@
                         "containers": [
                             {
                                 "name": "rocketchat",
-                                "image": "registry.connect.redhat.com/rocketchat/rocketchat:latest",
+                                "image": "${ROCKETCHAT_IMAGE}:latest",
                                 "ports": [
                                     {
                                         "containerPort": 3000,
@@ -424,6 +424,13 @@
             "value": "rocketchatdb",
             "required": true
         },
+        {
+            "name": "ROCKETCHAT_IMAGE",
+            "displayName": "RocketChat Image",
+            "description": "The RocketChat image to use for this deployment",
+            "required": true,
+            "value": "rocketchat/rocket.chat"
+        },
         {
             "name": "MONGODB_ADMIN_PASSWORD",
             "displayName": "MongoDB Admin Password",

diff --git a/.openshift/rocket-chat-persistent.json b/.openshift/rocket-chat-persistent.json
@@ -171,7 +171,7 @@
                 "name": "rocketchat"
             },
             "spec": {
-                "dockerImageRepository": "registry.connect.redhat.com/rocketchat/rocketchat",
+                "dockerImageRepository": "${ROCKETCHAT_IMAGE}",
                 "tags": [
                     {
                         "name": "latest",
@@ -261,7 +261,7 @@
                         "containers": [
                             {
                                 "name": "rocketchat",
-                                "image": "registry.connect.redhat.com/rocketchat/rocketchat:latest",
+                                "image": "${ROCKETCHAT_IMAGE}:latest",
                                 "ports": [
                                     {
                                         "containerPort": 3000,
@@ -452,6 +452,13 @@
             "from": "[a-zA-Z0-9]{16}",
             "required": true
         },
+        {
+            "name": "ROCKETCHAT_IMAGE",
+            "displayName": "RocketChat Image",
+            "description": "The RocketChat image to use for this deployment",
+            "required": true,
+            "value": "rocketchat/rocket.chat"
+        },
         {
             "name": "VOLUME_CAPACITY",
             "displayName": "Volume Capacity",

diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js
@@ -28,7 +28,8 @@ class API extends Restivus {
 			roles: 0,
 			statusDefault: 0,
 			_updatedAt: 0,
-			customFields: 0
+			customFields: 0,
+			settings: 0
 		};
 
 		this._config.defaultOptionsEndpoint = function _defaultOptionsEndpoint() {