build: cleanup worker

l3vels · Nov 2, 2023 · ce48c61 · ce48c61
1 parent b8e2738
commit ce48c61
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 520 deletions.
diff --git a/.github/workflows/deploy_worker.yml b/.github/workflows/deploy_worker.yml
@@ -1,4 +1,4 @@
-name: Deploy worker
+name: Deploy Worker
 
 on:
   push:
@@ -13,28 +13,6 @@ env:
   TR_DIRECTORY: "apps/server/terraform"
 
 jobs:
-  # Build_beat:
-  #   name: Build Application Container
-  #   timeout-minutes: 15
-  #   runs-on: ubuntu-latest
-  #   outputs:
-  #     tag_name: ${{ steps.build-image.outputs.TAG_NAME }}
-  #   environment: dev
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-
-  #     - name: 'Build and push image'
-  #       uses: azure/docker-login@v1
-  #       with:
-  #         login-server: ${{ vars.ACR_REGISTRY }}
-  #         username: ${{ secrets.AZURE_USERNAME }}
-  #         password: ${{ secrets.AZURE_PASSWORD }}
-  #     - run: |
-  #          docker build -t ${{ vars.ACR_REGISTRY }}/${{ env.ACR_REPOSITORY_BEAT }}:latest -f apps/worker/docker/Dockerfile.beat apps/worker
-  #          docker push ${{ vars.ACR_REGISTRY }}/${{ env.ACR_REPOSITORY_BEAT }}:latest
-  #          echo "TAG_NAME=${{ github.sha }}" >> $GITHUB_ENV
-
   Build_worker:
     name: Build Application Container
     timeout-minutes: 15

diff --git a/apps/server/services/schedule.py b/apps/server/services/schedule.py
@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 
-# import arrow
+import arrow
 from fastapi_sqlalchemy import db
 
 from models.chat import ChatModel

diff --git a/apps/worker/README.md b/apps/worker/README.md
@@ -1,4 +1,9 @@
 # Worker for jobs
 
+## Running
+
+```bash
 cd apps/worker
-docker-compose up
+docker build -t worker -f docker/Dockerfile .
+docker run -p 3001:80 -t worker
+```
diff --git a/apps/worker/docker-compose.yml b/apps/worker/docker-compose.yml
diff --git a/apps/worker/docker/Dockerfile b/apps/worker/docker/Dockerfile
@@ -8,9 +8,6 @@ ENV PYTHONUNBUFFERED 1
 # Set work directory
 WORKDIR /app
 
-# Change permissions of the work directory
-RUN chmod 777 /app
-
 # Install dependencies
 COPY pyproject.toml poetry.lock /app/
 
@@ -26,6 +23,9 @@ RUN apt-get update && apt-get install -y supervisor
 # Copy project
 COPY ./ /app/
 
+# Change permissions of the work directory
+RUN chmod 777 /app
+
 # Copy supervisor configuration
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 

diff --git a/apps/worker/docker/Dockerfile.beat b/apps/worker/docker/Dockerfile.beat
diff --git a/apps/worker/docker/Dockerfile.worker b/apps/worker/docker/Dockerfile.worker
diff --git a/apps/worker/health_check.py b/apps/worker/health_check.py
diff --git a/apps/worker/poetry.lock b/apps/worker/poetry.lock
diff --git a/apps/worker/pyproject.toml b/apps/worker/pyproject.toml
@@ -8,13 +8,10 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.11"
 celery = "^5.3.4"
-requests = "^2.31.0"
 python-dotenv = "^1.0.0"
 redis = "^5.0.1"
 httpx = "^0.25.0"
 flower = "^2.0.1"
-fastapi = "^0.104.1"
-uvicorn = "^0.23.2"
 
 
 [build-system]

diff --git a/apps/worker/supervisord_beat.conf b/apps/worker/supervisord_beat.conf
diff --git a/apps/worker/supervisord_worker.conf b/apps/worker/supervisord_worker.conf