Merge branch 'dev' into api-test

Seshat-Global-History-Databank · Jul 8, 2024 · d2feb42 · d2feb42
2 parents 50d528e + 0bff9ab
commit d2feb42
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,11 +7,13 @@ on:
     paths:
       - 'Dockerfile'
       - 'requirements.txt'
+      - '.github/workflows/build.yml'
   pull_request:
     branches: [dev]
     paths:
       - 'Dockerfile'
       - 'requirements.txt'
+      - '.github/workflows/build.yml'
 
 jobs:
   build:
@@ -30,4 +32,4 @@ jobs:
       with:
         context: .
         push: true
-        tags: docker.pkg.github.com/edwardchalstrey1/seshat/tests-image:latest
+        tags: docker.pkg.github.com/seshat-global-history-databank/seshat/tests-image:latest
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,8 +20,8 @@ jobs:
         password: ${{ secrets.GH_TOKEN }}
     - name: Pull and run Docker image
       run: |
-        docker pull docker.pkg.github.com/edwardchalstrey1/seshat/tests-image:latest
-        docker run -d -p 5432:5432 -v ${{ github.workspace }}:/seshat -e DJANGO_SETTINGS_MODULE=seshat.settings.local -e POSTGRES_PASSWORD=postgres -e PGDATA=/var/lib/postgresql/data/db-files/ -e GITHUB_ACTIONS='true' --name seshat_testing docker.pkg.github.com/edwardchalstrey1/seshat/tests-image:latest
+        docker pull docker.pkg.github.com/seshat-global-history-databank/seshat/tests-image:latest
+        docker run -d -p 5432:5432 -v ${{ github.workspace }}:/seshat -e DJANGO_SETTINGS_MODULE=seshat.settings.local -e POSTGRES_PASSWORD=postgres -e PGDATA=/var/lib/postgresql/data/db-files/ -e GITHUB_ACTIONS='true' --name seshat_testing docker.pkg.github.com/seshat-global-history-databank/seshat/tests-image:latest
     - name: Sleep, then check PostgreSQL connectivity
       run: |
         sleep 10

diff --git a/docs/source/getting-started/setup/local/macos.rst b/docs/source/getting-started/setup/local/macos.rst
@@ -219,11 +219,11 @@ The file should look like this:
 
 .. code-block::
 
-    NAME=<seshat_db_name>
-    USER=postgres
-    HOST=localhost
-    PORT=5432
-    PASSWORD=<db_password>
+    DB_NAME=<seshat_db_name>
+    DB_USER=postgres
+    DB_HOST=localhost
+    DB_PORT=5432
+    DB_PASSWORD=<db_password>
 
 
 Step 10: Migrate the database

diff --git a/seshat/settings/local.py b/seshat/settings/local.py
@@ -39,11 +39,11 @@
     DATABASES = {
         'default': {
             'ENGINE': 'django.contrib.gis.db.backends.postgis',
-            'NAME': env('NAME'),
-            'USER': 'postgres',
-            'HOST': env('HOST'),
-            'PORT': env('PORT'),
-            'PASSWORD': env('PASSWORD')
+            'NAME': env('DB_NAME'),
+            'USER': env('DB_USER') or 'postgres',
+            'HOST': env('DB_HOST'),
+            'PORT': env('DB_PORT'),
+            'PASSWORD': env('DB_PASSWORD')
         }
     }
     """