diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index c70a110..8bf9299 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -17,6 +17,12 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ vars.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry uses: docker/login-action@v2 @@ -32,5 +38,7 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: | + dawsh/marzneshin:latest + dawsh/marzneshin:${{github.ref_name}} ghcr.io/khodedawsh/marzneshin:latest ghcr.io/khodedawsh/marzneshin:${{github.ref_name}} diff --git a/Dockerfile b/Dockerfile index abb5262..92fafcc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,9 +7,12 @@ WORKDIR /app COPY . /app RUN apt-get update -y \ - && apt-get install npm make -y --no-install-recommends \ + && apt-get install npm make gcc python3-dev -y --no-install-recommends \ && make dashboard-build \ - && rm -rf /var/lib/apt/lists/* \ - && pip install --no-cache-dir --upgrade -r /app/requirements.txt + && pip install --no-cache-dir --upgrade -r /app/requirements.txt \ + && apt-get clean -y \ + && apt-get autoremove npm gcc python3-dev -y \ + && make dashboard-cleanup \ + && rm -rf /var/lib/apt/lists/* CMD ["make", "start"] diff --git a/makefile b/makefile index f9661dd..fe53b3d 100644 --- a/makefile +++ b/makefile @@ -15,3 +15,6 @@ dashboard-dev: -- --host 0.0.0.0 \ --base ../app/dashboard/ \ --clearScreen false + +dashboard-cleanup: + rm -rf app/dashboard/node_modules/ diff --git a/requirements.txt b/requirements.txt index ac60516..f020a67 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,8 +14,6 @@ psutil==5.9.7 pydantic==2.5.3 PyMySQL==1.1.0 pyOpenSSL==23.3.0 -pyOpenSSL==23.3.0 -pyTelegramBotAPI==4.15.2 pyTelegramBotAPI==4.15.2 python-decouple==3.8 python-dotenv==1.0.0 @@ -35,3 +33,4 @@ aiohttp==3.9.1 python-multipart==0.0.6 xxhash==3.4.1 grpcio==1.60.0 +psycopg==3.1.18