Merge branch 'master' of https://github.com/himanshu272/Online-Judge

.db.env.example

@@ -0,0 +1,3 @@
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_DB=postgres

.env.prod.example

@@ -0,0 +1,14 @@
+SECRET_KEY=yourkeyhere
+DEBUG=True
+ALLOWED_HOSTS=127.0.0.1, localhost
+GOOGLE_CLIENT_ID=google_client
+GOOGLE_CLIENT_SECRET=google_secret_key
+GITHUB_CLIENT_ID=github_id
+GITHUB_CLIENT_SECRET=github_secret
+GITHUB_REDIRECT_URI=redirect_uri
+DB_NAME=postgres
+DB_USER=postgres
+DB_PASSWORD=postgres
+DB_HOST=db
+EXECUTOR_URL=http://127.0.0.1:5000/
+CELERY_BROKER_URL=redis://redis:6379

.gitignore

@@ -4,6 +4,9 @@ db.sqlite3-journal
 *.pyc
 .env
 .frnt.env
+.env.prod
+.db.env
+.env.prod.proxy-comp
 env/
 .vscode
 testcases/

docker-compose.yml → docker-compose.dev.yml

@@ -4,17 +4,15 @@ services:
 
   db:
     image: postgres:12
-    environment:
-      - POSTGRES_DB=postgres
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
+    env_file: 
+      .db.env
     volumes:
       - postgres_data:/var/lib/postgresql/data/
 
   redis:
     image: redis
 
-  web:
+  backend:
     build: .
     deploy:
       restart_policy:
@@ -25,11 +23,12 @@ services:
       python manage.py makemigrations interface && 
       python manage.py migrate --noinput && 
       python manage.py migrate --noinput interface && 
-      python manage.py collectstatic --no-input &&
       python manage.py loaddata language_models.json &&
-      gunicorn judge.wsgi:application --bind 0.0.0.0:8000 --workers 4"
+      python manage.py runserver 0.0.0.0:8000"
     volumes:
-      - .:/backend
+      - app:/backend:rw
+      - static:/backend/static/
+      - media:/backend/media/
     env_file: 
       - .env
     ports:
@@ -46,7 +45,7 @@ services:
     depends_on:
       - redis
       - db 
-      - web
+      - backend
 
   frontend:
     build: ./website
@@ -57,4 +56,7 @@ services:
       - "3000:3000"
 
 volumes:
-  postgres_data:
+  postgres_data:
+  app:
+  static:
+  media:

docker-compose.prod.yml

@@ -0,0 +1,62 @@
+version: '3.7'
+
+services:
+
+  db:
+    image: postgres:12
+    env_file: 
+      .db.env
+    volumes:
+      - postgres_data:/var/lib/postgresql/data/
+
+  redis:
+    image: redis
+
+  backend:
+    build: .
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
+    command: >- 
+      bash -c "python manage.py makemigrations &&
+      python manage.py makemigrations interface && 
+      python manage.py migrate --noinput && 
+      python manage.py migrate --noinput interface && 
+      python manage.py collectstatic --no-input &&
+      python manage.py loaddata /backend/language_models.json &&
+      gunicorn judge.wsgi:application --bind 0.0.0.0:8000 --workers 4"
+    volumes:
+      - app:/backend:rw
+      - static:/backend/static/
+      - media:/backend/media/
+    env_file: 
+      - .env.prod
+    ports:
+      - "8000:8000"
+    depends_on:
+      - db
+      - redis
+
+  executor:
+    image: phantsure/oj:latest
+    depends_on:
+      - redis
+      - db 
+      - backend
+
+  celery:
+    build: .
+    command: celery -A judge worker -l info
+    volumes:
+      - .:/backend
+    depends_on:
+      - redis
+      - db
+      - backend
+
+volumes:
+  postgres_data:
+  app:
+  media:
+  static:

website/Dockerfile

@@ -1,4 +1,3 @@
-# pull official base image
 FROM node:13.12.0
 
 RUN mkdir /frontend

website/Dockerfile.dev

@@ -0,0 +1,8 @@
+FROM node:13.12.0
+
+RUN mkdir /frontend
+WORKDIR /frontend
+
+COPY . .
+RUN npm install
+RUN npm run dev