diff --git a/api/Dockerfile b/api/Dockerfile index 39a95eecd..8c2be6a22 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10.9-alpine +FROM python:3.11-alpine LABEL Maintainer="Rajesh Rajendran" LABEL Maintainer="KRAIEM Taha Yassine" ARG GIT_SHA diff --git a/api/Dockerfile_alerts b/api/Dockerfile_alerts index 373ab5b29..495d1969f 100644 --- a/api/Dockerfile_alerts +++ b/api/Dockerfile_alerts @@ -1,4 +1,4 @@ -FROM python:3.10.9-alpine +FROM python:3.11-alpine LABEL Maintainer="Rajesh Rajendran" LABEL Maintainer="KRAIEM Taha Yassine" ARG GIT_SHA diff --git a/api/Dockerfile_bundle b/api/Dockerfile_bundle deleted file mode 100644 index b047f6d6c..000000000 --- a/api/Dockerfile_bundle +++ /dev/null @@ -1,29 +0,0 @@ -FROM python:3.9.12-slim -LABEL Maintainer="Rajesh Rajendran" -WORKDIR /work -COPY . . -COPY ../utilities ./utilities -RUN rm entrypoint.sh && rm .chalice/config.json -RUN mv entrypoint.bundle.sh entrypoint.sh && mv .chalice/config.bundle.json .chalice/config.json -RUN pip install -r requirements.txt -t ./vendor --upgrade -RUN pip install chalice==1.22.2 -# Installing Nodejs -RUN apt update && apt install -y curl && \ - curl -fsSL https://deb.nodesource.com/setup_12.x | bash - && \ - apt install -y nodejs && \ - apt remove --purge -y curl && \ - rm -rf /var/lib/apt/lists/* && \ - cd utilities && \ - npm install - -# Add Tini -# Startup daemon -ENV TINI_VERSION v0.19.0 -ARG envarg -ENV ENTERPRISE_BUILD ${envarg} -ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini -RUN chmod +x /tini -RUN adduser -u 1001 openreplay -D -USER 1001 -ENTRYPOINT ["/tini", "--"] -CMD ./entrypoint.sh diff --git a/api/entrypoint.bundle.sh b/api/entrypoint.bundle.sh deleted file mode 100755 index 8478d9d14..000000000 --- a/api/entrypoint.bundle.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -cd utilities -nohup npm start &> /tmp/utilities.log & -cd .. -python env_handler.py -chalice local --no-autoreload --host 0.0.0.0 --stage ${ENTERPRISE_BUILD} diff --git a/api/requirements-alerts.txt b/api/requirements-alerts.txt index 8402d4775..ee82cddfe 100644 --- a/api/requirements-alerts.txt +++ b/api/requirements-alerts.txt @@ -1,15 +1,15 @@ -requests==2.28.1 -urllib3==1.26.13 -boto3==1.26.45 +requests==2.28.2 +urllib3==1.26.14 +boto3==1.26.53 pyjwt==2.6.0 psycopg2-binary==2.9.5 -elasticsearch==8.5.3 +elasticsearch==8.6.0 jira==3.4.1 -fastapi==0.89.0 +fastapi==0.89.1 uvicorn[standard]==0.20.0 -python-decouple==3.6 +python-decouple==3.7 pydantic[email]==1.10.4 apscheduler==3.9.1.post1 \ No newline at end of file diff --git a/api/requirements.txt b/api/requirements.txt index 8402d4775..ee82cddfe 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -1,15 +1,15 @@ -requests==2.28.1 -urllib3==1.26.13 -boto3==1.26.45 +requests==2.28.2 +urllib3==1.26.14 +boto3==1.26.53 pyjwt==2.6.0 psycopg2-binary==2.9.5 -elasticsearch==8.5.3 +elasticsearch==8.6.0 jira==3.4.1 -fastapi==0.89.0 +fastapi==0.89.1 uvicorn[standard]==0.20.0 -python-decouple==3.6 +python-decouple==3.7 pydantic[email]==1.10.4 apscheduler==3.9.1.post1 \ No newline at end of file diff --git a/ee/api/Dockerfile b/ee/api/Dockerfile index d8c735a19..3250baacc 100644 --- a/ee/api/Dockerfile +++ b/ee/api/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10.9-alpine +FROM python:3.11-alpine LABEL Maintainer="Rajesh Rajendran" LABEL Maintainer="KRAIEM Taha Yassine" RUN apk add --no-cache build-base libressl libffi-dev libressl-dev libxslt-dev libxml2-dev xmlsec-dev xmlsec tini diff --git a/ee/api/Dockerfile_alerts b/ee/api/Dockerfile_alerts index a006ee226..8e1eda530 100644 --- a/ee/api/Dockerfile_alerts +++ b/ee/api/Dockerfile_alerts @@ -1,4 +1,4 @@ -FROM python:3.10.9-alpine +FROM python:3.11-alpine LABEL Maintainer="Rajesh Rajendran" LABEL Maintainer="KRAIEM Taha Yassine" RUN apk add --no-cache build-base tini diff --git a/ee/api/Dockerfile_crons b/ee/api/Dockerfile_crons index d0311ad3b..686516b11 100644 --- a/ee/api/Dockerfile_crons +++ b/ee/api/Dockerfile_crons @@ -1,4 +1,4 @@ -FROM python:3.10.9-alpine +FROM python:3.11-alpine LABEL Maintainer="Rajesh Rajendran" LABEL Maintainer="KRAIEM Taha Yassine" RUN apk add --no-cache build-base tini diff --git a/ee/api/requirements-alerts.txt b/ee/api/requirements-alerts.txt index e88fcba30..30b8bda25 100644 --- a/ee/api/requirements-alerts.txt +++ b/ee/api/requirements-alerts.txt @@ -1,16 +1,16 @@ -requests==2.28.1 -urllib3==1.26.13 -boto3==1.26.45 +requests==2.28.2 +urllib3==1.26.14 +boto3==1.26.53 pyjwt==2.6.0 psycopg2-binary==2.9.5 -elasticsearch==8.5.3 +elasticsearch==8.6.0 jira==3.4.1 -fastapi==0.89.0 +fastapi==0.89.1 uvicorn[standard]==0.20.0 -python-decouple==3.6 +python-decouple==3.7 pydantic[email]==1.10.4 apscheduler==3.9.1.post1 diff --git a/ee/api/requirements-crons.txt b/ee/api/requirements-crons.txt index ed7d49b55..a485e4987 100644 --- a/ee/api/requirements-crons.txt +++ b/ee/api/requirements-crons.txt @@ -1,9 +1,9 @@ -requests==2.28.1 -urllib3==1.26.13 -boto3==1.26.45 +requests==2.28.2 +urllib3==1.26.14 +boto3==1.26.53 pyjwt==2.6.0 psycopg2-binary==2.9.5 -elasticsearch==8.5.3 +elasticsearch==8.6.0 jira==3.4.1 diff --git a/ee/api/requirements.txt b/ee/api/requirements.txt index 4b456f979..c76d3afa0 100644 --- a/ee/api/requirements.txt +++ b/ee/api/requirements.txt @@ -1,16 +1,16 @@ -requests==2.28.1 -urllib3==1.26.13 -boto3==1.26.45 +requests==2.28.2 +urllib3==1.26.14 +boto3==1.26.53 pyjwt==2.6.0 psycopg2-binary==2.9.5 -elasticsearch==8.5.3 +elasticsearch==8.6.0 jira==3.4.1 -fastapi==0.89.0 +fastapi==0.89.1 uvicorn[standard]==0.20.0 -python-decouple==3.6 +python-decouple==3.7 pydantic[email]==1.10.4 apscheduler==3.9.1.post1 diff --git a/ee/utilities/package-lock.json b/ee/utilities/package-lock.json index 85fbfdf0e..911546157 100644 --- a/ee/utilities/package-lock.json +++ b/ee/utilities/package-lock.json @@ -10,13 +10,13 @@ "license": "Elastic License 2.0 (ELv2)", "dependencies": { "@maxmind/geoip2-node": "^3.5.0", - "@socket.io/redis-adapter": "^8.0.0", + "@socket.io/redis-adapter": "^8.0.1", "express": "^4.18.2", "jsonwebtoken": "^9.0.0", "redis": "^4.5.1", "socket.io": "^4.5.4", "ua-parser-js": "^1.0.32", - "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.15.0" + "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.19.0" } }, "node_modules/@maxmind/geoip2-node": { @@ -88,13 +88,13 @@ "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==" }, "node_modules/@socket.io/redis-adapter": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@socket.io/redis-adapter/-/redis-adapter-8.0.0.tgz", - "integrity": "sha512-CbXmsl90xVK/H7aITNKJsa4RcmaYByezDOf8EBGj9LdEoblQTJZGvH67kuoIM2aalzSdUf0Lk00XPVs8DujTNw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@socket.io/redis-adapter/-/redis-adapter-8.0.1.tgz", + "integrity": "sha512-qjYRaf+Xp/OEkQDqWwEXnCjcuBUtVCrV1loXTIqICF4D+HHAv4T4jgPHUagyzJQ9M/RmJL25GlG15wLjV2O37g==", "dependencies": { "debug": "~4.3.1", "notepack.io": "~3.0.1", - "socket.io-adapter": "^2.4.0", + "socket.io-adapter": "~2.4.0", "uid2": "1.0.0" }, "engines": { @@ -373,9 +373,9 @@ } }, "node_modules/engine.io-parser": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz", - "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz", + "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==", "engines": { "node": ">=10.0.0" } @@ -523,9 +523,9 @@ } }, "node_modules/get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", + "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -785,9 +785,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", - "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -1021,9 +1021,9 @@ "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==" }, "node_modules/socket.io-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", - "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz", + "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==", "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1" @@ -1122,8 +1122,8 @@ } }, "node_modules/uWebSockets.js": { - "version": "20.15.0", - "resolved": "git+ssh://git@github.com/uNetworking/uWebSockets.js.git#77bc1fd5577ae42b56675912eb8481a31f3fefd2" + "version": "20.19.0", + "resolved": "git+ssh://git@github.com/uNetworking/uWebSockets.js.git#42c9c0d5d31f46ca4115dc75672b0037ec970f28" }, "node_modules/vary": { "version": "1.1.2", diff --git a/ee/utilities/package.json b/ee/utilities/package.json index a63419935..ebc8ba8d9 100644 --- a/ee/utilities/package.json +++ b/ee/utilities/package.json @@ -19,12 +19,12 @@ "homepage": "https://github.com/openreplay/openreplay#readme", "dependencies": { "@maxmind/geoip2-node": "^3.5.0", - "@socket.io/redis-adapter": "^8.0.0", + "@socket.io/redis-adapter": "^8.0.1", "express": "^4.18.2", "jsonwebtoken": "^9.0.0", "redis": "^4.5.1", "socket.io": "^4.5.4", "ua-parser-js": "^1.0.32", - "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.15.0" + "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.19.0" } } diff --git a/sourcemap-reader/package.json b/sourcemap-reader/package.json index f6470c57c..3904256b0 100644 --- a/sourcemap-reader/package.json +++ b/sourcemap-reader/package.json @@ -18,7 +18,7 @@ }, "homepage": "https://github.com/openreplay/openreplay#readme", "dependencies": { - "aws-sdk": "^2.1284.0", + "aws-sdk": "^2.1298.0", "express": "^4.18.2", "source-map": "^0.7.4" } diff --git a/utilities/package-lock.json b/utilities/package-lock.json index a90deceda..739173b95 100644 --- a/utilities/package-lock.json +++ b/utilities/package-lock.json @@ -274,9 +274,9 @@ } }, "node_modules/engine.io-parser": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz", - "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz", + "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==", "engines": { "node": ">=10.0.0" } @@ -411,9 +411,9 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "node_modules/get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", + "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -673,9 +673,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", - "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -883,9 +883,9 @@ "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==" }, "node_modules/socket.io-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", - "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz", + "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==", "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1"