From 81cc19f5b57472e287b69425960c85f578e7d6cd Mon Sep 17 00:00:00 2001 From: Jonathan Cremin Date: Fri, 6 May 2016 11:35:41 +0100 Subject: [PATCH] Remove custom buildpack, use heroku-postbuild instead --- .buildpacks | 1 - Dockerfile | 21 --------------------- package.json | 7 +++++-- 3 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 .buildpacks delete mode 100644 Dockerfile diff --git a/.buildpacks b/.buildpacks deleted file mode 100644 index 0b13796..0000000 --- a/.buildpacks +++ /dev/null @@ -1 +0,0 @@ -https://github.com/kudos/heroku-buildpack-nodejs-jspm.git diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index c7f2ff0..0000000 --- a/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM mhart/alpine-node -MAINTAINER Jonathan Cremin - -WORKDIR /app - -RUN apk add --update make gcc g++ python git - -COPY package.json package.json - -RUN npm install - -RUN apk del make gcc g++ python git && \ - rm -rf /tmp/* /var/cache/apk/* /root/.npm /root/.node-gyp - -COPY . . - -RUN npm run build - -EXPOSE 3000 - -CMD ["npm", "start"] diff --git a/package.json b/package.json index c5c9315..7d56a7e 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,12 @@ "scripts": { "build": "babel -d public/views views", "cover": "istanbul cover _mocha -- --require babel-core/register --require co-mocha test/**/*.js", - "start": "npm run build && node -r babel-core/register app.js", + "start": "node -r babel-core/register app.js", "test": "mocha --require co-mocha --compilers js:babel-core/register test/**/*.js --timeout=10000", "watch": "parallelshell \"npm run watch-js\" \"npm run watch-server\"", "watch-js": "babel -wd public/views views", - "watch-server": "nodemon -x \"node -r babel-core/register\" -e js,jsx -i public/ -i chrome/ app.js" + "watch-server": "nodemon -x \"node -r babel-core/register\" -e js,jsx -i public/ -i chrome/ app.js", + "heroku-postbuild": "jspm install && npm run build" }, "engines": { "node": "^5.0.0", @@ -61,6 +62,7 @@ "react": "~0.14.5", "react-dom": "~0.14.5", "react-google-analytics": "~0.2.0", + "react-helmet": "^3.0.1", "react-router": "~1.0.0", "spotify": "~0.3.0", "superagent": "~1.6.1", @@ -85,6 +87,7 @@ "react": "npm:react@~0.14.5", "react-dom": "npm:react-dom@~0.14.5", "react-google-analytics": "npm:react-google-analytics@~0.2.0", + "react-helmet": "npm:react-helmet@^3.0.1", "react-router": "npm:react-router@~1.0.0", "superagent": "npm:superagent@~1.2.0" },