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

[Snyk] Upgrade apexcharts from 3.44.0 to 3.49.1 #100

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0539f1f
fix: requirements.txt to reduce vulnerabilities
snyk-bot Nov 27, 2023
d9c8928
Merge pull request #1 from Niraj-Dilshan/snyk-fix-ce8b662ce094d8369c4…
Niraj-Dilshan Nov 27, 2023
529539e
fix: Dockerfile to reduce vulnerabilities
snyk-bot Nov 27, 2023
01b0d35
Merge pull request #2 from Niraj-Dilshan/snyk-fix-d2c27a8a4f33623d5ce…
Niraj-Dilshan Nov 27, 2023
24ef8c7
build(deps): bump redis from 4.3.6 to 4.4.4
dependabot[bot] Nov 27, 2023
7ba9953
fix: upgrade react-hook-form from 7.43.2 to 7.48.2
snyk-bot Nov 28, 2023
50bf55a
fix: upgrade react-datepicker from 4.10.0 to 4.21.0
snyk-bot Nov 28, 2023
7be9aec
fix: upgrade vite-tsconfig-paths from 4.0.5 to 4.2.1
snyk-bot Nov 28, 2023
ca04e8f
fix: upgrade apexcharts from 3.40.0 to 3.44.0
snyk-bot Nov 28, 2023
e210931
fix: requirements.txt to reduce vulnerabilities
snyk-bot Nov 29, 2023
570a1d2
fix: app/dashboard/package.json & app/dashboard/package-lock.json to …
snyk-bot Nov 30, 2023
2d27411
upgrade
Niraj-Dilshan Dec 1, 2023
96bd5e6
Merge pull request #11 from Niraj-Dilshan/snyk-fix-98ca8c9a01870be04c…
Niraj-Dilshan Dec 1, 2023
d25eea2
Merge pull request #10 from Niraj-Dilshan/snyk-fix-d5317caf2dcf9063e0…
Niraj-Dilshan Dec 1, 2023
3ca5e8f
Merge pull request #3 from Niraj-Dilshan/dependabot/pip/redis-4.4.4
Niraj-Dilshan Dec 1, 2023
c572c7e
Merge pull request #5 from Niraj-Dilshan/snyk-upgrade-19ae2c0b6cd3f8d…
Niraj-Dilshan Dec 1, 2023
666351b
Merge pull request #6 from Niraj-Dilshan/snyk-upgrade-afdfce0f354d972…
Niraj-Dilshan Dec 1, 2023
1bad336
Merge pull request #7 from Niraj-Dilshan/snyk-upgrade-bb2c60e82d8ec5d…
Niraj-Dilshan Dec 1, 2023
5dc286c
Merge pull request #8 from Niraj-Dilshan/snyk-upgrade-705e58a8f20e156…
Niraj-Dilshan Dec 1, 2023
86b9618
fix: upgrade react-router-dom from 6.8.1 to 6.18.0
snyk-bot Dec 2, 2023
321c500
fix: upgrade @chakra-ui/react from 2.5.5 to 2.8.2
snyk-bot Dec 2, 2023
df21786
fix: upgrade i18next-http-backend from 2.2.0 to 2.4.1
snyk-bot Dec 2, 2023
6557948
fix: upgrade react-i18next from 12.2.0 to 12.3.1
snyk-bot Dec 2, 2023
6d23740
fix: upgrade react-loading-skeleton from 3.1.1 to 3.3.1
snyk-bot Dec 2, 2023
d667389
Merge pull request #12 from Niraj-Dilshan/snyk-upgrade-d245393c54c8e3…
Niraj-Dilshan Dec 15, 2023
a08dfa0
Merge pull request #13 from Niraj-Dilshan/snyk-upgrade-7f15dbcd3c72b6…
Niraj-Dilshan Dec 15, 2023
5eda990
Merge pull request #14 from Niraj-Dilshan/snyk-upgrade-b72ad13df93d34…
Niraj-Dilshan Dec 15, 2023
0ebfd5d
Merge pull request #15 from Niraj-Dilshan/snyk-upgrade-6302c2ed80c593…
Niraj-Dilshan Dec 15, 2023
1d6ebef
Merge pull request #16 from Niraj-Dilshan/snyk-upgrade-798cdcfb33db05…
Niraj-Dilshan Dec 15, 2023
0d4e183
fix: upgrade apexcharts from 3.44.0 to 3.49.1
snyk-bot Jun 2, 2024
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
10 changes: 5 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ UVICORN_HOST = "0.0.0.0"
UVICORN_PORT = 8000


## We highly recommend add admin using `marzban cli` tool and do not use
## We highly recommend add admin using `infinity cli` tool and do not use
## the following variables which is somehow hard codded infrmation.
# SUDO_USERNAME = "admin"
# SUDO_PASSWORD = "admin"

# UVICORN_UDS: "/run/marzban.socket"
# UVICORN_SSL_CERTFILE = "/var/lib/marzban/certs/example.com/fullchain.pem"
# UVICORN_SSL_KEYFILE = "/var/lib/marzban/certs/example.com/key.pem"
# UVICORN_UDS: "/run/infinity.socket"
# UVICORN_SSL_CERTFILE = "/var/lib/infinity/certs/example.com/fullchain.pem"
# UVICORN_SSL_KEYFILE = "/var/lib/infinity/certs/example.com/key.pem"


# XRAY_JSON = "xray_config.json"
Expand All @@ -28,7 +28,7 @@ UVICORN_PORT = 8000

# DISCORD_WEBHOOK_URL = "https://discord.com/api/webhooks/xxxxxxx"

# CUSTOM_TEMPLATES_DIRECTORY="/var/lib/marzban/templates/"
# CUSTOM_TEMPLATES_DIRECTORY="/var/lib/infinity/templates/"
# CLASH_SUBSCRIPTION_TEMPLATE="clash/my-custom-template.yml"
# SUBSCRIPTION_PAGE_TEMPLATE="subscription/index.html"
# HOME_PAGE_TEMPLATE="home/index.html"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
gozargah/marzban:${{github.ref_name}}
ghcr.io/gozargah/marzban:${{github.ref_name}}
Niraj-Dilshan/infinity:${{github.ref_name}}
ghcr.io/Niraj-Dilshan/infinity:${{github.ref_name}}
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
gozargah/marzban:latest
gozargah/marzban:${{github.ref_name}}
ghcr.io/gozargah/marzban:latest
ghcr.io/gozargah/marzban:${{github.ref_name}}
Niraj-Dilshan/infinity:latest
Niraj-Dilshan/infinity:${{github.ref_name}}
ghcr.io/Niraj-Dilshan/infinity:latest
ghcr.io/Niraj-Dilshan/infinity:${{github.ref_name}}
68 changes: 0 additions & 68 deletions CONTRIBUTING.md

This file was deleted.

10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.13-rc-slim

ENV PYTHONUNBUFFERED 1

Expand All @@ -8,7 +8,7 @@ RUN apt-get update \
&& apt-get install -y curl unzip gcc python3-dev \
&& rm -rf /var/lib/apt/lists/*

RUN bash -c "$(curl -L https://github.com/Gozargah/Marzban-scripts/raw/master/install_latest_xray.sh)"
RUN bash -c "$(curl -L https://github.com/Niraj-Dilshan/infinity-script/raw/master/install_latest_xray.sh)"

COPY ./requirements.txt /code/
RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
Expand All @@ -17,8 +17,8 @@ COPY . /code

RUN apt-get remove -y curl unzip gcc python3-dev

RUN ln -s /code/marzban-cli.py /usr/bin/marzban-cli \
&& chmod +x /usr/bin/marzban-cli \
&& marzban-cli completion install --shell bash
RUN ln -s /code/infinity-cli.py /usr/bin/infinity-cli \
&& chmod +x /usr/bin/infinity-cli \
&& infinity-cli completion install --shell bash

CMD ["bash", "-c", "alembic upgrade head; python main.py"]
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 21 January 2023

Copyright (C) 2023 Gozargah organization.
Copyright (C) 2023 Niraj-Dilshan organization.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down
Loading