From 83af2b13955938bb2ae6f349f960f76cc20ae4c0 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Sun, 7 Mar 2021 13:52:51 +1100
Subject: [PATCH] Tweaked docker-compose

---
 README.md           |  4 +---
 configure-script.js | 12 ++++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index f589307..8854333 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,7 @@ An API centric auth server. Uses Sequelize and mariaDB by default.
 
 # Setup
 
-TODO: Dockerize this project
-
-TODO: Write setup instructions, once dockerized
+There are multiple ways to run this app - it can run on it's own via `npm start` (for production) or `npm run dev` (for development). it can also run inside docker using `docker-compose up --build` - run `node configure-script.js` to generate docker-compose.yml.
 
 # API
 
diff --git a/configure-script.js b/configure-script.js
index 3ac564d..363650a 100644
--- a/configure-script.js
+++ b/configure-script.js
@@ -54,7 +54,7 @@ const question = (prompt, def = null) => {
 version: '3'
 
 services:
-  app:
+  ${appName}:
     build:
       context: .
     ports:
@@ -90,14 +90,15 @@ services:
   database:
     image: mariadb:latest
     environment:
-      MYSQL_DATABASE: ${appName}
-      MYSQL_USER: ${appDBUser}
-      MYSQL_PASSWORD: ${appDBPass}
-      MYSQL_ROOT_PASSWORD: ${dbRootPass}
+      - MYSQL_DATABASE: ${appName}
+      - MYSQL_USER: ${appDBUser}
+      - MYSQL_PASSWORD: ${appDBPass}
+      - MYSQL_ROOT_PASSWORD: ${dbRootPass}
     networks: 
       - app-network
     volumes:
       - ./mysql:/var/lib/mysql
+      - ./startup.sql:/docker-entrypoint-initdb.d/startup.sql:ro
   traefik:
     image: "traefik:v2.4"
     container_name: "traefik"
@@ -116,7 +117,6 @@ services:
     volumes:
       - "./letsencrypt:/letsencrypt"
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "./startup.sql:/docker-entrypoint-initdb.d/startup.sql:ro"
     networks:
       - app-network
 networks: