Skip to content

Commit

Permalink
merged development
Browse files Browse the repository at this point in the history
  • Loading branch information
alansikora committed Jan 11, 2022
2 parents f758625 + a06e811 commit c24ae89
Show file tree
Hide file tree
Showing 2,610 changed files with 55,110 additions and 48,012 deletions.
2 changes: 1 addition & 1 deletion .docker-mongo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.22.1-buster-slim
FROM node:12.22.8-buster-slim

LABEL maintainer="buildmaster@rocket.chat"

Expand Down
2 changes: 1 addition & 1 deletion .docker-mongo/licenses/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.
Copyright (c) 2015-2022 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
Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.22.1-buster-slim
FROM node:12.22.8-buster-slim

LABEL maintainer="buildmaster@rocket.chat"

Expand Down
30 changes: 15 additions & 15 deletions .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
FROM registry.access.redhat.com/ubi8/nodejs-12

ENV RC_VERSION 4.3.0-develop
ENV RC_VERSION 4.4.0-develop

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}"
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}"

USER root
RUN dnf install -y python38 && rm -rf /var/cache /var/log/dnf* /var/log/yum.*
USER default

RUN set -x \
&& gpg --keyserver keys.openpgp.org --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
&& gpg --keyserver keys.openpgp.org --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

Expand Down
2 changes: 1 addition & 1 deletion .docker/licenses/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.
Copyright (c) 2015-2022 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
Expand Down
26 changes: 5 additions & 21 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"extends": [
"@rocket.chat/eslint-config"
"@rocket.chat/eslint-config",
"plugin:prettier/recommended"
],
"parser": "babel-eslint",
"globals": {
Expand Down Expand Up @@ -54,7 +55,8 @@
"extends": [
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/eslint-recommended",
"@rocket.chat/eslint-config"
"@rocket.chat/eslint-config",
"plugin:prettier/recommended"
],
"globals": {
"Atomics": "readonly",
Expand Down Expand Up @@ -83,7 +85,6 @@
],
"indent": "off",
"no-dupe-class-members": "off",
"no-extra-parens": "off",
"no-spaced-func": "off",
"no-unused-vars": "off",
"no-useless-constructor": "off",
Expand All @@ -96,34 +97,17 @@
"syntax"
],
"@typescript-eslint/ban-ts-ignore": "off",
"@typescript-eslint/indent": [
"error",
"tab",
{
"SwitchCase": 1
}
],
"@typescript-eslint/interface-name-prefix": [
"error",
"always"
],
"@typescript-eslint/no-extra-parens": [
"error",
"all",
{
"conditionalAssign": true,
"nestedBinaryExpressions": false,
"returnAssign": true,
"ignoreJSX": "all",
"enforceForArrowConditionals": false
}
],
"@typescript-eslint/no-dupe-class-members": "error",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": ["error", {
"argsIgnorePattern": "^_",
"ignoreRestSiblings": true
}],
"@typescript-eslint/prefer-optional-chain": "warn",
"anti-trojan-source/no-bidi": "error"
},
"env": {
Expand Down
Loading

0 comments on commit c24ae89

Please sign in to comment.