Browse Source

Merge branch 'master' of github.com:panoplymedia/audiogram

Darren Cox 7 years ago
parent
commit
ca0b5ba6af
6 changed files with 8 additions and 3957 deletions
  1. 1 0
      .gitignore
  2. 4 0
      INSTALL.md
  3. 0 4
      README.md
  4. 0 3950
      package-lock.json
  5. 2 2
      package.json
  6. 1 1
      server/index.js

+ 1 - 0
.gitignore View File

7
 media/
7
 media/
8
 *.log
8
 *.log
9
 .jobs
9
 .jobs
10
+package-lock.json

+ 4 - 0
INSTALL.md View File

133
 docker run -p 8888:8888 -t -i audiogram
133
 docker run -p 8888:8888 -t -i audiogram
134
 ```
134
 ```
135
 
135
 
136
+## AWS installation
137
+
138
+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.
139
+
136
 ## Mac troubleshooting
140
 ## Mac troubleshooting
137
 
141
 
138
 If things aren't working on a Mac, there are a few fixes you can try.
142
 If things aren't working on a Mac, there are a few fixes you can try.

File diff suppressed because it is too large
+ 0 - 4
README.md


File diff suppressed because it is too large
+ 0 - 3950
package-lock.json


+ 2 - 2
package.json View File

25
   "dependencies": {
25
   "dependencies": {
26
     "aws-sdk": "^2.2.39",
26
     "aws-sdk": "^2.2.39",
27
     "browserify": "^13.0.0",
27
     "browserify": "^13.0.0",
28
-    "canvas": "^1.6.5",
28
+    "canvas": "git+https://github.com/chearon/node-canvas.git#12971f64a66b",
29
     "compression": "^1.6.1",
29
     "compression": "^1.6.1",
30
     "d3": "4.10.0",
30
     "d3": "4.10.0",
31
     "dotenv": "^2.0.0",
31
     "dotenv": "^2.0.0",
35
     "morgan": "^1.7.0",
35
     "morgan": "^1.7.0",
36
     "multer": "^1.1.0",
36
     "multer": "^1.1.0",
37
     "node-ffprobe": "^1.2.2",
37
     "node-ffprobe": "^1.2.2",
38
-    "node-uuid": "^1.4.7",
39
     "redis": "^2.4.2",
38
     "redis": "^2.4.2",
40
     "rimraf": "^2.5.0",
39
     "rimraf": "^2.5.0",
41
     "smartquotes": "^1.0.0",
40
     "smartquotes": "^1.0.0",
42
     "underscore": "^1.8.3",
41
     "underscore": "^1.8.3",
42
+    "uuid": "^3.0.1",
43
     "webaudio-peaks": "0.0.5",
43
     "webaudio-peaks": "0.0.5",
44
     "winston": "^2.2.0"
44
     "winston": "^2.2.0"
45
   },
45
   },

+ 1 - 1
server/index.js View File

3
     compression = require("compression"),
3
     compression = require("compression"),
4
     path = require("path"),
4
     path = require("path"),
5
     multer = require("multer"),
5
     multer = require("multer"),
6
-    uuid = require("node-uuid"),
6
+    uuid = require("uuid"),
7
     mkdirp = require("mkdirp");
7
     mkdirp = require("mkdirp");
8
 
8
 
9
 // Routes and middleware
9
 // Routes and middleware