Преглед изворни кода

Merge f2dc893637e211f14d69738a9052589a872f15e6 into c1b14f115474d1469d474aecfd6584601d42e754

Chuck Dries пре 6 година
родитељ
комит
a7fcf6a32c
No account linked to committer's email
5 измењених фајлова са 36 додато и 4 уклоњено
  1. 6 3
      Dockerfile
  2. 5 0
      INSTALL.md
  3. 10 0
      docker-compose.yml
  4. BIN
      settings/backgrounds/ForksEstate.png
  5. 15 1
      settings/themes.json

+ 6 - 3
Dockerfile Прегледај датотеку

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

+ 5 - 0
INSTALL.md Прегледај датотеку

@@ -133,6 +133,11 @@ Now you can run Audiogram in a container using that image:
133 133
 docker run -p 8888:8888 -t -i audiogram
134 134
 ```
135 135
 
136
+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.
137
+```sh
138
+docker-compose up
139
+```
140
+
136 141
 ## AWS installation
137 142
 
138 143
 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.

+ 10 - 0
docker-compose.yml Прегледај датотеку

@@ -0,0 +1,10 @@
1
+version: '3'
2
+services:
3
+  audiogram:
4
+    build: .
5
+    ports:
6
+     - "8888:8888"
7
+    volumes:
8
+     - .:/home/audiogram/audiogram
9
+    command: npm start
10
+

BIN
settings/backgrounds/ForksEstate.png Прегледај датотеку


+ 15 - 1
settings/themes.json Прегледај датотеку

@@ -1,4 +1,18 @@
1 1
 {
2
+  "State Press Theme: Forks Estate": {
3
+    "width": 1280,
4
+    "height": 720,
5
+    "captionAlign": "left",
6
+    "captionTop": 60,
7
+    "captionLeft": 570,
8
+    "captionRight": 1200,
9
+    "backgroundImage": "ForksEstate.png",
10
+    "foregroundColor": "#ffffff",
11
+    "captionColor": "#ffffff",
12
+    "waveTop": 420,
13
+    "waveBottom": 700,
14
+    "captionFont": "300 65px 'Source Sans Pro'"
15
+  },
2 16
   "default": {
3 17
     "width": 1280,
4 18
     "height": 720,
@@ -102,4 +116,4 @@
102 116
     "foregroundColor": "#0eb8ba",
103 117
     "backgroundImage": "nyc.png"
104 118
   }
105
-}
119
+}