Merge branch 'master' into feature/compose-database-healthcheck

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: RACTF Discord
+    url: https://discord.gg/FfW2xXR
+    about: Check out the RACTF Discord server for advice on using the platform.

.pre-commit-config.yaml

@@ -1,13 +1,27 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
+    rev: v4.0.1
     hooks:
       - id: check-merge-conflict
       - id: end-of-file-fixer
       - id: mixed-line-ending
         args: [--fix=lf]
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: check-executables-have-shebangs
+      - id: check-shebang-scripts-are-executable
+      - id: check-symlinks
+      - id: check-toml
+      - id: check-json
+      - id: check-yaml
+      - id: detect-aws-credentials
+        args: [--allow-missing-credentials]
+      - id: detect-private-key
+      - id: no-commit-to-branch
+      - id: pretty-format-json
+        args: [--autofix]
 
   - repo: local
     hooks:

Makefile

@@ -17,7 +17,7 @@ test: migrate
 
 coverage: migrate
 	pytest --cov=. --cov-report=xml src && \
-	coverage html && \
+	coverage html
 	which xdg-open && \
 	xdg-open htmlcov/index.html || true
 

docker-compose.yml

@@ -2,7 +2,8 @@ version: "3.8"
 
 x-gunicorn-master: &x-gunicorn-master
   build: .
-  entrypoint: 
+  entrypoint:
+  privileged: true
   volumes:
     - .:/app
   environment:
@@ -20,12 +21,14 @@ x-gunicorn-master: &x-gunicorn-master
     - SQL_HOST=database
     - SQL_USER=postgres
     - SQL_DATABASE=postgres
+    - EMAIL_PROVIDER=CONSOLE
   depends_on:
     database:
       condition: service_healthy
     redis:
       condition: service_started
 
+
 services:
   redis:
     image: docker.io/redis:5
@@ -42,7 +45,7 @@ services:
       retries: 30
 
   shell:
-    image: index.docker.io/ractf/shell:latest
+    image: ghcr.io/ractf/shell:latest
     ports:
       - "8000:8000"
     environment:
@@ -82,4 +85,4 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /root/.docker/config.json:/config.json
-    command: --interval 5
+    command: --interval 5