Connect Ore to the Docker DB

Signed-off-by: Jadon Fowler <[email protected]>

.docker/db/init.sql

@@ -1,3 +1,2 @@
-
 create database spongeauth;
 create role spongeauth with login password 'spongeauth';

conf/application.conf.template

@@ -11,7 +11,7 @@ application {
     uploadsDir = ${?UPLOADS_DIR}
 
     # Add a dot at the start of the url to trust all subdomains
-    trustedUrlHosts     =   [ ".spongepowered.org" ]
+    trustedUrlHosts     =   [ ".spongepowered.org", "spongeauth" ]
 
     fakeUser {
         enabled    =   false
@@ -173,7 +173,7 @@ slick.dbs.default {
         url = ${?JDBC_DATABASE_URL}
         user = "root"
         user = ${?JDBC_DATABASE_USERNAME}
-        password = "ore"
+        password = ""
         password = ${?JDBC_DATABASE_PASSWORD}
     }
 }

docker-compose.yml

@@ -1,8 +1,5 @@
 version: "2"
 
-#volumes:
-#  ore-db:
-
 services:
   app:
     build: .
@@ -15,14 +12,13 @@ services:
   db:
     build: '.docker/db/'
     restart: always
-#    volumes:
-#      - ore-db:/var/lib/postgresql
     environment:
       POSTGRES_USER: root
-      POSTGRES_PASSWORD: ore
+      POSTGRES_PASSWORD: ""
       POSTGRES_DB: ore
   spongeauth:
     image: spongepowered/spongeauth
     depends_on:
       - 'db'
-
+    ports:
+      - "8000:8000"

docker.sh

@@ -1,6 +1,4 @@
 #!/bin/sh
 
-#groupadd -g "$(stat -c '%g' /home/play/ore/app)" -o spongeauth
-#useradd -u "$(stat -c '%u' /home/play/ore/app)" -g spongeauth -o -m spongeauth
-
-activator run
+# We want to connect to db/ore
+env JDBC_DATABASE_URL="jdbc:postgresql://db/ore" SPONGE_AUTH_URL="http://spongeauth:8000" activator run