Skip to content

Fix NPM dependency issues and Java7 issues #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 16, 2017
Merged

Fix NPM dependency issues and Java7 issues #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f9d202
Change Oracle Java installer to target Java8
frenata Nov 16, 2017
1ac9040
Update express dependency
frenata Nov 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions API/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,16 @@
*/




var express = require('express');
var http = require('http');
var arr = require('./compilers');
var sandBox = require('./DockerSandbox');
var app = express.createServer();
var port=80;
var bodyParser = require('body-parser');
var app = express();
var server = http.createServer(app);
var port=8080;


var ExpressBrute = require('express-brute');
Expand All @@ -21,7 +26,7 @@ var bruteforce = new ExpressBrute(store,{
});

app.use(express.static(__dirname));
app.use(express.bodyParser());
app.use(bodyParser());

app.all('*', function(req, res, next)
{
Expand Down Expand Up @@ -71,4 +76,4 @@ app.get('/', function(req, res)
});

console.log("Listening at "+port)
app.listen(port);
server.listen(port);
5 changes: 3 additions & 2 deletions API/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
"version": "1.0.0",
"main": "app.js",
"dependencies": {
"express": "2.5.11",
"express": "4.*",
"body-parser" : "*",
"express-brute":"*",
"exports": "*"
},
"author": "Osman Ali",
"license": "MIT"
}
}
4 changes: 2 additions & 2 deletions Setup/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ RUN apt-get install -y software-properties-common
#grab oracle java (auto accept licence)
RUN add-apt-repository -y ppa:webupd8team/java
RUN apt-get update
RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
RUN apt-get install -y oracle-java7-installer
RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
RUN apt-get install -y oracle-java8-installer


RUN apt-get install -y gobjc
Expand Down