Skip to content

Commit ccbfbc5

Browse files
graywolf336graywolf336
authored
[OTHER] Develop sync (RocketChat#10487)
* add redhat dockerfile to master (RocketChat#10408) * add redhat dockerfile to master * Add redhat dockerfile to set-version helper script * [FIX] Even TypeErrors with SAML (RocketChat#10475) * Bump version to 0.63.2
1 parent adb3f97 commit ccbfbc5

6 files changed

Lines changed: 101 additions & 2 deletions

File tree

‎.docker/Dockerfile.rhel‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
2+
3+
ENV RC_VERSION 0.63.2
4+
5+
MAINTAINER buildmaster@rocket.chat
6+
7+
LABEL name="Rocket.Chat" \
8+
vendor="Rocket.Chat" \
9+
version="${RC_VERSION}" \
10+
release="1" \
11+
url="https://rocket.chat" \
12+
summary="The Ultimate Open Source Web Chat Platform" \
13+
description="The Ultimate Open Source Web Chat Platform" \
14+
run="docker run -d --name ${NAME} ${IMAGE}"
15+
16+
17+
# This is ugly... But for some reason npm and node aren't available at this stage.
18+
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
19+
20+
RUN set -x \
21+
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104 \
22+
&& curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download" -o rocket.chat.tgz \
23+
&& curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
24+
&& gpg --verify rocket.chat.tgz.asc \
25+
&& tar -zxf rocket.chat.tgz -C /opt/app-root/src/ \
26+
&& cd /opt/app-root/src/bundle/programs/server \
27+
&& npm install
28+
29+
COPY licenses /licenses
30+
31+
VOLUME /opt/app-root/src/uploads
32+
33+
WORKDIR /opt/app-root/src/bundle
34+
35+
ENV DEPLOY_METHOD=docker-redhat \
36+
NODE_ENV=production \
37+
MONGO_URL=mongodb://mongo:27017/rocketchat \
38+
HOME=/tmp \
39+
PORT=3000 \
40+
ROOT_URL=http://localhost:3000
41+
42+
EXPOSE 3000
43+
44+
CMD ["node", "main.js"]

‎.docker/licenses/LICENSE‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
22+

‎.github/history.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12207,5 +12207,23 @@
1220712207
"web-flow"
1220812208
]
1220912209
}
12210+
],
12211+
"0.63.2": [
12212+
{
12213+
"pr": "10475",
12214+
"title": "[FIX] Even TypeErrors with SAML",
12215+
"userLogin": "graywolf336",
12216+
"contributors": [
12217+
"graywolf336"
12218+
]
12219+
},
12220+
{
12221+
"pr": "10408",
12222+
"title": "add redhat dockerfile to master",
12223+
"userLogin": "geekgonecrazy",
12224+
"contributors": [
12225+
"geekgonecrazy"
12226+
]
12227+
}
1221012228
]
1221112229
}

‎.scripts/set-version.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const files = [
2525
'./.circleci/snap.sh',
2626
'./.circleci/update-releases.sh',
2727
'./.docker/Dockerfile',
28+
'./.docker/Dockerfile.rhel',
2829
'./packages/rocketchat-lib/rocketchat.info'
2930
];
3031
const readFile = (file) => {

‎HISTORY.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@
44

55

66

7+
# 0.63.2
8+
`2018-04-17 · 1 🐛 · 1 🔍`
9+
10+
### 🐛 Bug fixes
11+
12+
- Even TypeErrors with SAML ([#10475](https://github.com/RocketChat/Rocket.Chat/pull/10475))
13+
14+
<details>
15+
<summary>🔍 Minor changes</summary>
16+
17+
- add redhat dockerfile to master ([#10408](https://github.com/RocketChat/Rocket.Chat/pull/10408))
18+
19+
</details>
20+
721
# 0.63.1
822
`2018-04-07 · 5 🐛 · 3 👩‍💻👨‍💻`
923

‎packages/meteor-accounts-saml/saml_utils.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,9 @@ SAML.prototype.validateResponse = function(samlResponse, relayState, callback) {
396396
attributes.forEach(function(attribute) {
397397
const value = self.getElement(attribute, 'AttributeValue');
398398
if (typeof value[0] === 'string') {
399-
profile[attribute.$.Name] = value[0];
399+
profile[attribute.$.Name.value] = value[0];
400400
} else {
401-
profile[attribute.$.Name] = value[0]._;
401+
profile[attribute.$.Name.value] = value[0]._;
402402
}
403403
});
404404
}

0 commit comments

Comments
 (0)