Misc cleanup

README.md

@@ -16,7 +16,7 @@ If you are building from source, be sure to run `docker-compose build`.
 
 1. docker-compose up -d db svger
 2. docker-compose run web migrate
-3. docker-compose run web init --admin-email=nick.gerakines@gmail.com --admin-password=asd123 --admin-name=nick --database=postgresql://postgres:password@db:5432/tavern?sslmode=disable
+3. docker-compose run web init --admin-email=nick.gerakines@gmail.com --admin-password=password --admin-name=nick
 4. docker-compose up -d
 
 # License

docker-compose.yml

@@ -11,8 +11,8 @@ services:
     volumes:
       - ./init.sql:/docker-entrypoint-initdb.d/10-init.sql
       - ./postgres:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_PASSWORD=password
+    env_file:
+      - ./db.env
 
   svger:
     image: ngerakines/svger:1.1.0
@@ -30,8 +30,7 @@ services:
       - PORT=9100
 
   web:
-    build: .
-    image: ngerakines/tavern
+    image: ngerakines/tavern:0.1.0-rc2
     restart: on-failure
     networks:
       - external_network
@@ -46,14 +45,9 @@ services:
       - db
       - svger
     env_file:
-      - ./common.env
-      - ./off-the-clock.env
-    environment:
-      - LISTEN=0.0.0.0:9000
-      - DATABASE=postgresql://postgres:password@db:5432/tavern?sslmode=disable
-      - SVGER=http://svger:9100/
-      - ASSET_STORAGE_REMOTE_DENY=*
-      - ALLOW_REPLY_COLLECTION_UPDATES=true
+      - ./tavern-town.env
+    volumes:
+      - ./assets:/assets
 
 networks:
   external_network: