PostGIS migration for docker

backend/Dockerfile

@@ -13,7 +13,7 @@ WORKDIR /code
 
 # Install system dependencies
 RUN apt-get update \
-    && apt-get install -y git postgresql-client \
+    && apt-get install -y git postgresql-client gdal-bin libgdal-dev \
     && apt-get clean
 
 # Install Python dependencies

backend/entrypoint.sh

@@ -13,6 +13,9 @@ done
 
 >&2 echo "PostgreSQL is up - continuing..."
 
+# run sql commands
+# psql -h "$PGHOST" -U "$PGUSER" -d "$PGDATABASE" -f /app/backend/init-postgis.sql
+
 # Apply Django migrations
 python manage.py migrate
 

backend/init-postgis.sql

@@ -0,0 +1,2 @@
+CREATE EXTENSION IF NOT EXISTS postgis;
+CREATE EXTENSION IF NOT EXISTS postgis_topology;

backend/server/worldtravel/management/commands/worldtravel-seed.py

@@ -19,7 +19,7 @@ def setGeometry(region_code):
     json_file = os.path.join('static/data', f'{country_code.lower()}.json')
     
     if not os.path.exists(json_file):
-        print(f'File {country_code}.json does not exist')
+        print(f'File {country_code}.json does not exist (it probably hasn''t been added, contributors are welcome!)')
         return None
 
     try:

docker-compose.yml

@@ -2,8 +2,8 @@ version: "3.9"
 
 services:
   web:
-    #build: ./frontend/
+    build: ./frontend/
-    image: ghcr.io/seanmorley15/adventurelog-frontend:latest
+    #image: ghcr.io/seanmorley15/adventurelog-frontend:latest
     environment:
       - PUBLIC_SERVER_URL=http://server:8000 # MOST DOCKER USERS WILL NEVER NEED TO CHANGE THIS, EVEN IF YOU CHANGE THE PORTS
       - ORIGIN=http://localhost:8080
@@ -14,7 +14,7 @@ services:
       - server
 
   db:
-    image: postgres:latest
+    image: postgis/postgis:15-3.3
     environment:
       POSTGRES_DB: database
       POSTGRES_USER: adventure
@@ -23,8 +23,8 @@ services:
       - postgres_data:/var/lib/postgresql/data/
 
   server:
-    #build: ./backend/
+    build: ./backend/
-    image: ghcr.io/seanmorley15/adventurelog-backend:latest
+    #image: ghcr.io/seanmorley15/adventurelog-backend:latest
     environment:
       - PGHOST=db
       - PGDATABASE=database

frontend/src/routes/settings/+page.svelte

@@ -167,22 +167,25 @@
 		<button class="py-2 px-4 btn btn-primary mt-2">Change Email</button>
 	</form>
 </div>
-<div class="flex flex-col items-center">
+
-	<h1 class="text-center font-extrabold text-xl mt-4 mb-2">Data Export</h1>
+<div class="flex flex-col items-center mt-4">
-	<button class="btn btn-neutral mb-4" on:click={exportAdventures}> Export to JSON </button>
-	<p>This may take a few seconds...</p>
-</div>
-<div class="flex flex-col items-center">
 	<h1 class="text-center font-extrabold text-xl mt-4 mb-2">Visited Region Check</h1>
 	<p>
 		By selecting this, the server will check all of your visited adventures and mark the regions
 		they are located in as "visited" in world travel.
 	</p>
-	<button class="btn btn-neutral mb-4" on:click={checkVisitedRegions}>Update Visited Regions</button
+	<button class="btn btn-neutral mt-2 mb-2" on:click={checkVisitedRegions}
+		>Update Visited Regions</button
 	>
 	<p>This may take longer depending on the number of adventures you have.</p>
 </div>
 
+<div class="flex flex-col items-center mt-4">
+	<h1 class="text-center font-extrabold text-xl mt-4 mb-2">Data Export</h1>
+	<button class="btn btn-neutral mb-4" on:click={exportAdventures}> Export to JSON </button>
+	<p>This may take a few seconds...</p>
+</div>
+
 <small class="text-center"
 	><b>For Debug Use:</b> Server PK={user.pk} | Date Joined: {user.date_joined
 		? new Date(user.date_joined).toDateString()