diff --git a/safeshare/docker-compose.yml b/safeshare/docker-compose.yml index 8924ae1..4c0fea5 100644 --- a/safeshare/docker-compose.yml +++ b/safeshare/docker-compose.yml @@ -28,6 +28,10 @@ services: - REDIS_DB=0 - TRASH_TIMEOUT=60 - DJANGO_LOG_LEVEL=INFO + - VIRUSTOTAL_API_KEY=YOUR_VIRUSTOTAL_API_TOKEN + - AWS_ACCESS_KEY_ID=YOUR_AWS_ACCESS_KEY_ID + - AWS_SECRET_ACCESS_KEY=YOUR_AWS_SECRET_ACCESS_KEY + - REGION=YOUR_AWS_REGION depends_on: - redis networks: @@ -44,20 +48,6 @@ services: networks: - dbnet - safeshare-virus: - image: amusement3004/safeshare_vdb:latest - restart: - always - ports: - - "50051:50051" - environment: - - VIRUSTOTAL_API_KEY=YOUR_VIRUSTOTAL_API_TOKEN - - AWS_ACCESS_KEY_ID=YOUR_AWS_ACCESS_KEY_ID - - AWS_SECRET_ACCESS_KEY=YOUR_AWS_SECRET_ACCESS_KEY - - REGION=YOUR_AWS_REGION - networks: - - dbnet - volumes: redis_data: networks: diff --git a/safeshare/env b/safeshare/env index ebd7206..bb43b4f 100644 --- a/safeshare/env +++ b/safeshare/env @@ -3,25 +3,13 @@ DEBUG=True SECRET_KEY=your-secret-key -# MYSQL DATABASE -DB_NAME=your-db-name -DB_USER=your-db-user -DB_PASSWORD=your-db-password -DB_HOST=localhost -DB_PORT=3306 - -# CACHE (REDIS) -CACHE=True -REDIS_URL=redis://localhost:6379/0 - -# SQLITE_URL=sqlite:///my-local-sqlite.db -# CACHE_URL=memcache://127.0.0.1:11211,127.0.0.1:11212,127.0.0.1:11213 -CACHE=TRUE - REDIS_HOST=192.168.56.102 REDIS_PORT=6379 REDIS_DB=0 TRASH_TIMEOUT=30 # in seconds -AWS_ACCESS_KEY_ID='AKIA5VQLLGQ24RLS3KWK' -AWS_SECRET_ACCESS_KEY='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' \ No newline at end of file +VIRUSTOTAL_API_KEY= + +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +REGION=ap-southeast-1 \ No newline at end of file diff --git a/safeshare/requirements.txt b/safeshare/requirements.txt index 8d5c0b8..965dec1 100644 --- a/safeshare/requirements.txt +++ b/safeshare/requirements.txt @@ -18,7 +18,8 @@ djangorestframework-simplejwt==5.3.0 dr-scaffold==2.1.2 drf-nested-routers==0.93.4 drf-yasg==1.21.7 -grpcio==1.59.0 +grpcio==1.59.2 +grpcio-tools==1.59.2 idna==3.4 inflect==7.0.0 inflection==0.5.1 diff --git a/safeshare/start.sh b/safeshare/start.sh index 654da13..ce30298 100755 --- a/safeshare/start.sh +++ b/safeshare/start.sh @@ -6,6 +6,9 @@ python manage.py migrate --noinput # Start your Django server in the background python manage.py runserver 0.0.0.0:8000 & +# Start virus scanning service +python safeshare_vdb/server.py & + # Sleep briefly to allow the Django server to start (you can adjust the sleep duration as needed) sleep 2