Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OTHER] Develop sync #10487

Merged
merged 4 commits into from
Apr 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7

ENV RC_VERSION 0.63.2

MAINTAINER [email protected]

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"]
22 changes: 22 additions & 0 deletions .docker/licenses/LICENSE
Original file line number Diff line number Diff line change
@@ -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.

18 changes: 18 additions & 0 deletions .github/history.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
]
}
1 change: 1 addition & 0 deletions .scripts/set-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
14 changes: 14 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@



# 0.63.2
`2018-04-17 · 1 🐛 · 1 🔍`

### 🐛 Bug fixes

- Even TypeErrors with SAML ([#10475](https://github.com/RocketChat/Rocket.Chat/pull/10475))

<details>
<summary>🔍 Minor changes</summary>

- add redhat dockerfile to master ([#10408](https://github.com/RocketChat/Rocket.Chat/pull/10408))

</details>

# 0.63.1
`2018-04-07 · 5 🐛 · 3 👩‍💻👨‍💻`

Expand Down
4 changes: 2 additions & 2 deletions packages/meteor-accounts-saml/saml_utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]._;
}
});
}
Expand Down