Merge pull request #2091 from coronasafe/develop

Merge Develop to Staging 24.16.1

.devcontainer/devcontainer.json

@@ -1,33 +1,24 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
 {
-	"name": "Care",
-	"dockerComposeFile": [
-    "../docker-compose.yaml",
-		"../docker-compose.local.yaml"
-	],
+  "name": "Care",
   "hostRequirements": {
     "cpus": 4
   },
-  "waitFor": "onCreateCommand",
-	"service": "backend",
-	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
-  "postCreateCommand": "python manage.py migrate && python manage.py collectstatic --noinput && python manage.py load_dummy_data",
-  "postAttachCommand": {
-    "server": "python manage.py runserver"
-  },
-	"customizations": {
-    "vscode": {
-      "extensions": [
-        "ms-python.python"
-      ]
-    }
-  },
-  "portsAttributes": {
-    "8000": {
-      "label": "Application",
-      "onAutoForward": "openPreview"
+  "image": "mcr.microsoft.com/devcontainers/python:1-3.11-bookworm",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+    "ghcr.io/devcontainers/features/node:1": {},
+    "ghcr.io/devcontainers/features/git:1": {},
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers-contrib/features/pipenv:2": {},
+    "ghcr.io/devcontainers-contrib/features/direnv:1": {},
+    "ghcr.io/devcontainers-contrib/features/apt-get-packages:1": {
+      "packages": "build-essential,libjpeg-dev,zlib1g-dev,libpq-dev,gettext,wget,curl,gnupg",
+      "preserve_apt_list": false
     }
   },
-  "forwardPorts": [9000]
+  "postCreateCommand": "echo 'eval \"$(direnv hook bash)\"' >> ~/.bashrc && cp .env.example .env",
+  "postAttachCommand": "make up",
+  "forwardPorts": [8000, 9000, 4000]
 }

.env.example

@@ -0,0 +1,20 @@
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_HOST=db
+POSTGRES_DB=care
+POSTGRES_PORT=5432
+DATABASE_URL=postgres://postgres:postgres@localhost:5433/care
+REDIS_URL=redis://localhost:6380
+CELERY_BROKER_URL=redis://localhost:6380/0
+
+FIDELIUS_URL=http://localhost:8092
+
+DJANGO_DEBUG=False
+
+BUCKET_REGION=ap-south-1
+BUCKET_KEY=key
+BUCKET_SECRET=secret
+BUCKET_ENDPOINT=http://localhost:4566
+BUCKET_EXTERNAL_ENDPOINT=http://localhost:4566
+FILE_UPLOAD_BUCKET=patient-bucket
+FACILITY_S3_BUCKET=facility-bucket

.github/dependabot.yml

@@ -23,3 +23,8 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+
+  - package-ecosystem: "devcontainers"
+    directory: "/"
+    schedule:
+      interval: weekly