Merge branch 'develop_pwa' into upstream_catchup_3.17.1

.docker/Dockerfile

@@ -8,6 +8,7 @@ RUN groupadd -g 65533 -r rocketchat \
     && mkdir -p /app/uploads \
     && chown rocketchat:rocketchat /app/uploads \
     && apt-get update \
+    && apt-get -y upgrade \
     && apt-get install -y --no-install-recommends fontconfig
 
 # --chown requires Docker 17.12 and works only on Linux

.eslintignore

@@ -20,3 +20,5 @@ ee/server/services/dist/**
 !/.mocharc.js
 !/client/.eslintrc.js
 !/ee/client/.eslintrc.js
+app/utils/client/lib/sha1.js
+app/analytics/server/trackEvents.js

.github/workflows/auto_catchup.yml

@@ -0,0 +1,37 @@
+name: Upstream catchup from Rocketchat develop
+
+on:
+  schedule:
+    - cron: '0 0 * * 1' #on every Monday
+
+jobs:
+  catchup:
+    name: Upstream Catchup
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Catchup Info
+      run: |
+        echo "GITHUB_ACTION: $GITHUB_ACTION"
+        echo "GITHUB_ACTOR: $GITHUB_ACTOR"
+        echo "GITHUB_REF: $GITHUB_REF"
+        echo "github.event_name: ${{ github.event_name }}"
+        cat $GITHUB_EVENT_PATH
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Set up Node
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12
+    - name: Create Catchup PR
+      uses: shubhsherl/[email protected]
+      with:
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        SOURCE_BRANCH: "master"
+        SOURCE_REPO: "RocketChat"
+        TARGET_BRANCH: "develop_pwa"
+        GITHUB_REPO: ${{github.repository}}
+        TITLE: "[Upstream Catchup] Merge RC:master to develop_pwa"
+        BODY: "Weekly Catchup PR to merge RC:master in develop_pwa."
+        DRAFT: "true"