Merge f2dc893637e211f14d69738a9052589a872f15e6 into c1b14f115474d1469d474aecfd6584601d42e754

Dockerfile

@@ -3,9 +3,9 @@ FROM ubuntu:16.04
 # Install dependencies
 RUN apt-get update --yes && apt-get upgrade --yes
 RUN apt-get install git nodejs npm \
-libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev libpng-dev build-essential g++ \
-ffmpeg \
-redis-server --yes
+    libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev libpng-dev build-essential g++ \
+    ffmpeg \
+    redis-server --yes
 
 RUN ln -s `which nodejs` /usr/bin/node
 
@@ -20,3 +20,6 @@ WORKDIR /home/audiogram/audiogram
 
 # Install dependencies
 RUN npm install
+
+
+CMD [ "npm", "start" ]

INSTALL.md

@@ -133,6 +133,11 @@ Now you can run Audiogram in a container using that image:
 docker run -p 8888:8888 -t -i audiogram
 ```
 
+If you have docker-compose, you can run audiogram using it. Docker-compose comes with docker for mac by default. Using it will allow you to make changes in your local directory, to themes and settings for example, and apply them without re-building the entire image.
+```sh
+docker-compose up
+```
+
 ## AWS installation
 
 If you're trying to run Audiogram on AWS services like Lambda or Elastic Beanstalk that rely on the Amazon Linux distribution, you will probably need to follow the [node-canvas Amazon Linux AMI instructions](https://github.com/Automattic/node-canvas/wiki/Installation---Amazon-Linux-AMI-(EC2)) to install the dependencies and/or package up the resulting binaries.

docker-compose.yml

@@ -0,0 +1,10 @@
+version: '3'
+services:
+  audiogram:
+    build: .
+    ports:
+     - "8888:8888"
+    volumes:
+     - .:/home/audiogram/audiogram
+    command: npm start
+

settings/themes.json

@@ -1,4 +1,18 @@
 {
+  "State Press Theme: Forks Estate": {
+    "width": 1280,
+    "height": 720,
+    "captionAlign": "left",
+    "captionTop": 60,
+    "captionLeft": 570,
+    "captionRight": 1200,
+    "backgroundImage": "ForksEstate.png",
+    "foregroundColor": "#ffffff",
+    "captionColor": "#ffffff",
+    "waveTop": 420,
+    "waveBottom": 700,
+    "captionFont": "300 65px 'Source Sans Pro'"
+  },
   "default": {
     "width": 1280,
     "height": 720,
@@ -102,4 +116,4 @@
     "foregroundColor": "#0eb8ba",
     "backgroundImage": "nyc.png"
   }
-}
+}