Merge branch 'main' into voicemute

Author: ChrisLovering

.github/CODEOWNERS

@@ -6,17 +6,12 @@ pydis_site/apps/api/viewsets/bot/infraction.py  @MarkKoz
 pydis_site/apps/home/**                         @ks129
 
 # Django ORM
-**/migrations/**                                @Akarys42
-**/models/**                                    @Akarys42 @Den4200
+**/models/**                                    @Den4200
 
 # CI & Docker
-.github/workflows/**                            @MarkKoz @Akarys42 @SebastiaanZ @Den4200 @ks129
-Dockerfile                                      @MarkKoz @Akarys42 @Den4200
-docker-compose.yml                              @MarkKoz @Akarys42 @Den4200
-
-# Tools
-poetry.lock                                     @Akarys42
-pyproject.toml                                  @Akarys42
+.github/workflows/**                            @MarkKoz @SebastiaanZ @Den4200 @ks129
+Dockerfile                                      @MarkKoz @Den4200
+docker-compose.yml                              @MarkKoz @Den4200
 
 # Metricity
 pydis_site/apps/api/models/bot/metricity.py     @jb3

.github/workflows/static-preview.yaml

@@ -0,0 +1,77 @@
+name: Build & Publish Static Preview
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build:
+    name: Build Static Preview
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+     # Create a commit SHA-based tag for the container repositories
+      - name: Create SHA Container Tag
+        id: sha_tag
+        run: |
+          tag=$(cut -c 1-7 <<< $GITHUB_SHA)
+          echo "::set-output name=tag::$tag"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Github Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Build the container, including an inline cache manifest to
+      # allow us to use the registry as a cache source.
+      - name: Build Docker Image (Main)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/main'
+        with:
+          context: .
+          push: true
+          cache-from: type=registry,ref=ghcr.io/python-discord/static-site:latest
+          cache-to: type=inline
+          tags: |
+            ghcr.io/python-discord/static-site:latest
+            ghcr.io/python-discord/static-site:${{ steps.sha_tag.outputs.tag }}
+          build-args: |
+            git_sha=${{ github.sha }}
+            STATIC_BUILD=TRUE
+
+      - name: Extract Build From Docker Image (Main)
+        if: github.ref == 'refs/heads/main'
+        run: |
+          mkdir docker_build \
+          && docker run --entrypoint /bin/echo --name site \
+          ghcr.io/python-discord/static-site:${{ steps.sha_tag.outputs.tag }} \
+          && docker cp site:/app docker_build/
+
+      # Build directly to a local folder
+      - name: Build Docker Image (PR)
+        uses: docker/build-push-action@v2
+        if: github.ref != 'refs/heads/main'
+        with:
+          context: .
+          push: false
+          cache-from: type=registry,ref=ghcr.io/python-discord/static-site:latest
+          outputs: type=local,dest=docker_build/
+          build-args: |
+            git_sha=${{ github.sha }}
+            STATIC_BUILD=TRUE
+
+      - name: Upload Build
+        uses: actions/upload-artifact@v2
+        with:
+          name: static-build
+          path: docker_build/app/build/
+          if-no-files-found: error

.gitignore

@@ -126,3 +126,6 @@ staticfiles/
 
 *.js.tmp
 log.*
+
+# Local Netlify folder
+.netlify

Dockerfile

@@ -36,6 +36,12 @@ RUN \
     METRICITY_DB_URL=postgres://localhost \
     python manage.py collectstatic --noinput --clear
 
+# Build static files if we are doing a static build
+ARG STATIC_BUILD=false
+RUN if [ $STATIC_BUILD = "TRUE" ] ; \
+  then SECRET_KEY=dummy_value python manage.py distill-local build --traceback --force ; \
+fi
+
 # Run web server through custom manager
 ENTRYPOINT ["python", "manage.py"]
 CMD ["run"]

manage.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 import os
+import platform
 import sys
+from pathlib import Path
 
 import django
 from django.contrib.auth import get_user_model
@@ -147,6 +149,22 @@ def run_server(self) -> None:
         gunicorn.app.wsgiapp.run()
 
 
+def clean_up_static_files(build_folder: Path) -> None:
+    """Recursively loop over the build directory and fix links."""
+    for file in build_folder.iterdir():
+        if file.is_dir():
+            clean_up_static_files(file)
+        elif file.name.endswith(".html"):
+            # Fix parent host url
+            new = file.read_text(encoding="utf-8").replace(f"//{os.getenv('PARENT_HOST')}", "")
+
+            # Fix windows paths if on windows
+            if platform.system() == "Windows":
+                new = new.replace("%5C", "/")
+
+            file.write_text(new, encoding="utf-8")
+
+
 def main() -> None:
     """Entry point for Django management script."""
     # Use the custom site manager for launching the server
@@ -155,8 +173,23 @@ def main() -> None:
 
     # Pass any others directly to standard management commands
     else:
+        _static_build = "distill" in sys.argv[1]
+
+        if _static_build:
+            # Build a static version of the site with no databases and API support
+            os.environ["STATIC_BUILD"] = "True"
+            if not os.getenv("PARENT_HOST"):
+                os.environ["PARENT_HOST"] = "REPLACE_THIS.HOST"
+
         execute_from_command_line(sys.argv)
 
+        if _static_build:
+            # Clean up parent host in generated files
+            for arg in sys.argv[2:]:
+                if not arg.startswith("-"):
+                    clean_up_static_files(Path(arg))
+                    break
+
 
 if __name__ == '__main__':
     main()