From 79c023e0fb6c24d77c9c06a4bb34b5247565e0fb Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Tue, 10 Apr 2018 15:09:23 -0500 Subject: [PATCH 1/3] add redhat dockerfile to master (#10408) * add redhat dockerfile to master * Add redhat dockerfile to set-version helper script --- .docker/Dockerfile.rhel | 44 ++++++++++++++++++++++++++++++++++++++++ .docker/licenses/LICENSE | 22 ++++++++++++++++++++ .scripts/set-version.js | 1 + 3 files changed, 67 insertions(+) create mode 100644 .docker/Dockerfile.rhel create mode 100644 .docker/licenses/LICENSE diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel new file mode 100644 index 000000000000..ee41afb5a6d6 --- /dev/null +++ b/.docker/Dockerfile.rhel @@ -0,0 +1,44 @@ +FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7 + +ENV RC_VERSION 0.63.1 + +MAINTAINER buildmaster@rocket.chat + +LABEL name="Rocket.Chat" \ + vendor="Rocket.Chat" \ + version="${RC_VERSION}" \ + release="1" \ + url="https://rocket.chat" \ + summary="The Ultimate Open Source Web Chat Platform" \ + description="The Ultimate Open Source Web Chat Platform" \ + run="docker run -d --name ${NAME} ${IMAGE}" + + +# This is ugly... But for some reason npm and node aren't available at this stage. +ENV PATH /opt/rh/rh-nodejs8/root/usr/bin:/opt/app-root/src/node_modules/.bin/:/opt/app-root/src/.npm-global/bin/:/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + +RUN set -x \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104 \ + && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download" -o rocket.chat.tgz \ + && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \ + && gpg --verify rocket.chat.tgz.asc \ + && tar -zxf rocket.chat.tgz -C /opt/app-root/src/ \ + && cd /opt/app-root/src/bundle/programs/server \ + && npm install + +COPY licenses /licenses + +VOLUME /opt/app-root/src/uploads + +WORKDIR /opt/app-root/src/bundle + +ENV DEPLOY_METHOD=docker-redhat \ + NODE_ENV=production \ + MONGO_URL=mongodb://mongo:27017/rocketchat \ + HOME=/tmp \ + PORT=3000 \ + ROOT_URL=http://localhost:3000 + +EXPOSE 3000 + +CMD ["node", "main.js"] diff --git a/.docker/licenses/LICENSE b/.docker/licenses/LICENSE new file mode 100644 index 000000000000..b3435a104885 --- /dev/null +++ b/.docker/licenses/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2015-2017 Rocket.Chat Technologies Corp. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/.scripts/set-version.js b/.scripts/set-version.js index e21035ee3a99..cad1c3b602da 100644 --- a/.scripts/set-version.js +++ b/.scripts/set-version.js @@ -25,6 +25,7 @@ const files = [ './.circleci/snap.sh', './.circleci/update-releases.sh', './.docker/Dockerfile', + './.docker/Dockerfile.rhel', './packages/rocketchat-lib/rocketchat.info' ]; const readFile = (file) => { From 6c45df6eeec169d0fb4e23f49a0d6c32d76bcb26 Mon Sep 17 00:00:00 2001 From: Bradley Hilton Date: Tue, 17 Apr 2018 00:08:39 -0500 Subject: [PATCH 2/3] [FIX] Even TypeErrors with SAML (#10475) --- packages/meteor-accounts-saml/saml_utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/meteor-accounts-saml/saml_utils.js b/packages/meteor-accounts-saml/saml_utils.js index 30eec18b57ba..75bf93fb8d2e 100644 --- a/packages/meteor-accounts-saml/saml_utils.js +++ b/packages/meteor-accounts-saml/saml_utils.js @@ -396,9 +396,9 @@ SAML.prototype.validateResponse = function(samlResponse, relayState, callback) { attributes.forEach(function(attribute) { const value = self.getElement(attribute, 'AttributeValue'); if (typeof value[0] === 'string') { - profile[attribute.$.Name] = value[0]; + profile[attribute.$.Name.value] = value[0]; } else { - profile[attribute.$.Name] = value[0]._; + profile[attribute.$.Name.value] = value[0]._; } }); } From e1143c527f964b2925788ecc799650ee8db5bdd9 Mon Sep 17 00:00:00 2001 From: Bradley Hilton Date: Tue, 17 Apr 2018 00:10:05 -0500 Subject: [PATCH 3/3] Bump version to 0.63.2 --- .docker/Dockerfile | 2 +- .docker/Dockerfile.rhel | 2 +- .github/history.json | 18 ++++++++++++++++++ .sandstorm/sandstorm-pkgdef.capnp | 2 +- .travis/snap.sh | 2 +- HISTORY.md | 14 ++++++++++++++ package.json | 2 +- packages/rocketchat-lib/rocketchat.info | 2 +- 8 files changed, 38 insertions(+), 6 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 08bc27b32bf3..33f6da117eb7 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,6 +1,6 @@ FROM rocketchat/base:8 -ENV RC_VERSION 0.63.1 +ENV RC_VERSION 0.63.2 MAINTAINER buildmaster@rocket.chat diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index ee41afb5a6d6..a342fbb619fd 100644 --- a/.docker/Dockerfile.rhel +++ b/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7 -ENV RC_VERSION 0.63.1 +ENV RC_VERSION 0.63.2 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index 1c523399eede..9a8a304445a7 100644 --- a/.github/history.json +++ b/.github/history.json @@ -12207,5 +12207,23 @@ "web-flow" ] } + ], + "0.63.2": [ + { + "pr": "10475", + "title": "[FIX] Even TypeErrors with SAML", + "userLogin": "graywolf336", + "contributors": [ + "graywolf336" + ] + }, + { + "pr": "10408", + "title": "add redhat dockerfile to master", + "userLogin": "geekgonecrazy", + "contributors": [ + "geekgonecrazy" + ] + } ] } \ No newline at end of file diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index e904c24b4384..f6680c7bc61c 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = ( appVersion = 62, # Increment this for every release. - appMarketingVersion = (defaultText = "0.63.1"), + appMarketingVersion = (defaultText = "0.63.2"), # Human-readable representation of appVersion. Should match the way you # identify versions of your app in documentation and marketing. diff --git a/.travis/snap.sh b/.travis/snap.sh index a0be6fc1e43e..f7d412f91bf9 100755 --- a/.travis/snap.sh +++ b/.travis/snap.sh @@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then RC_VERSION=$TRAVIS_TAG else CHANNEL=edge - RC_VERSION=0.63.1 + RC_VERSION=0.63.2 fi echo "Preparing to trigger a snap release for $CHANNEL channel" diff --git a/HISTORY.md b/HISTORY.md index 23102f27536a..d8b67eb2bb48 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,18 @@ +# 0.63.2 +`2018-04-17 ยท 1 ๐Ÿ› ยท 1 ๐Ÿ”` + +### ๐Ÿ› Bug fixes + +- Even TypeErrors with SAML ([#10475](https://github.com/RocketChat/Rocket.Chat/pull/10475)) + +
+๐Ÿ” Minor changes + +- add redhat dockerfile to master ([#10408](https://github.com/RocketChat/Rocket.Chat/pull/10408)) + +
+ # 0.63.1 `2018-04-07 ยท 5 ๐Ÿ› ยท 3 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/package.json b/package.json index f4f231619594..35fa4f0fb14e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "0.63.1", + "version": "0.63.2", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/" diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info index eb0c811e983b..7cecdbe3af67 100644 --- a/packages/rocketchat-lib/rocketchat.info +++ b/packages/rocketchat-lib/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "0.63.1" + "version": "0.63.2" }