deploy to aws (#367)

* deploy to aws * new cfl package
ocadotechnology · Nov 1, 2024 · a0821a5 · a0821a5
1 parent db5f802
commit a0821a5
Show file tree

Hide file tree

Showing 9 changed files with 690 additions and 629 deletions.
diff --git a/.gcloudignore b/.gcloudignore
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -26,10 +26,6 @@
         "localhost:8000"
       ],
       "django": true,
-      "env": {
-        "SERVICE_IS_ROOT": "1",
-        "SERVICE_NAME": "portal"
-      },
       "justMyCode": false,
       "name": "Django Server",
       "preLaunchTask": "setup",

diff --git a/Pipfile b/Pipfile
@@ -23,7 +23,7 @@ name = "pypi"
 # 5. Run `pipenv install --dev` in your terminal.
 
 [packages]
-codeforlife = {ref = "v0.19.2", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
+codeforlife = {ref = "v0.20.0", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
 # 🚫 Don't add [packages] below that are inherited from the CFL package.
 pyjwt = "==2.6.0" # TODO: upgrade to latest version
 # TODO: Needed by RR. Remove when RR has moved to new system.
@@ -32,7 +32,7 @@ django-sekizai = "==2.0.0"
 django-classy-tags = "==2.0.0"
 
 [dev-packages]
-codeforlife = {ref = "v0.19.2", git = "https://github.com/ocadotechnology/codeforlife-package-python.git", extras = ["dev"]}
+codeforlife = {ref = "v0.20.0", git = "https://github.com/ocadotechnology/codeforlife-package-python.git", extras = ["dev"]}
 # codeforlife = {file = "../codeforlife-package-python", editable = true, extras = ["dev"]}
 # 🚫 Don't add [dev-packages] below that are inherited from the CFL package.
 

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/app.yaml b/app.yaml
diff --git a/application.py b/application.py
@@ -0,0 +1,20 @@
+"""
+© Ocado Group
+Created on 11/04/2024 at 16:51:45(+01:00).
+
+The entrypoint to our app.
+"""
+
+import os
+
+from codeforlife.app import StandaloneApplication
+from django.core.asgi import get_asgi_application
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+
+if __name__ == "__main__":
+    StandaloneApplication(app=get_asgi_application()).run()
+else:
+    app = get_wsgi_application()
diff --git a/main.py b/main.py
diff --git a/scripts/setup b/scripts/setup
@@ -3,9 +3,6 @@ set -e
 
 cd "${BASH_SOURCE%/*}"
 
-export SERVICE_IS_ROOT="1"
-export SERVICE_NAME="portal"
-
 pipenv install --dev
 export STATIC_MODE="default"  # TODO: Remove after RR FE restructure
 pipenv run python ../manage.py migrate --noinput

diff --git a/settings.py b/settings.py
@@ -13,6 +13,10 @@
 import os
 from pathlib import Path
 
+# NOTE: Must come before importing CFL settings.
+os.environ["SERVICE_NAME"] = "portal"
+os.environ["SERVICE_IS_ROOT"] = "1"
+
 # Custom
 
 EMAIL_VERIFICATION_TIMEOUT = 60 * 60 * 24