Merge remote-tracking branch 'agrafix/master'

This commit is contained in:
Thaddee Tyl 2014-09-28 21:44:02 +02:00
commit a340ce9d6e
2 changed files with 20 additions and 4 deletions

15
Dockerfile Normal file
View File

@ -0,0 +1,15 @@
FROM ubuntu:14.04
RUN apt-get update && apt-get install -y node npm
RUN apt-get update && apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++
RUN npm cache clean -f
RUN npm install -g n
RUN n stable
RUN npm install canvas
RUN mkdir -p /var/app
ADD package.json /var/app/package.json
RUN cd /var/app && npm install
ADD . /var/app
ENV INFOSITE http://shields.io
WORKDIR /var/app
CMD npm run start

View File

@ -1,4 +1,5 @@
var serverPort = +process.env.PORT || +process.argv[2] || 80;
var infoSite = process.env.INFOSITE || "http://shields.io";
var camp = require('camp').start({
documentRoot: __dirname,
port: serverPort
@ -1489,7 +1490,7 @@ function getNugetPackage(apiUrl, id, done) {
done(err);
return;
}
try {
var data = JSON.parse(buffer);
var result = data.d.results[0];
@ -1502,7 +1503,7 @@ function getNugetPackage(apiUrl, id, done) {
done(err);
return;
}
try {
var data = JSON.parse(buffer);
var result = data.d.results[0];
@ -1801,7 +1802,7 @@ cache(function(data, match, sendBadge) {
sendBadge(format, badgeData);
return;
}
switch (statusMatch[1]) {
case 'success':
badgeData.text[1] = 'passed';
@ -1936,7 +1937,7 @@ function(data, match, end, ask) {
// Redirect the root to the website.
camp.route(/^\/$/, function(data, match, end, ask) {
ask.res.statusCode = 302;
ask.res.setHeader('Location', 'http://shields.io');
ask.res.setHeader('Location', infoSite);
ask.res.end();
});