Skip to content

Update NodeJS & Add Dockerfile for micro services #13

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

Open
ElusiveMind wants to merge 5 commits into
base: sprint/sprint-7
Choose a base branch
from
Open

Update NodeJS & Add Dockerfile for micro services #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8875a1
Update packages for node 12
ElusiveMind Mar 6, 2021
e2fb1d3
Add our docker file for micro-service builds
ElusiveMind Mar 6, 2021
288d3ae
Add our package-lock.json file
ElusiveMind Mar 7, 2021
9eaa007
Update to use our updated restify plugins.
ElusiveMind Mar 7, 2021
f252abb
Update YAML config loader calls and versions
ElusiveMind Mar 7, 2021
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*~
.DS_Store
node_modules
env.sh
stash-passport-demo
data
data
20 changes: 20 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# ProboCI
# https://www.probo.ci

FROM node:12.20.2

RUN useradd --user-group --create-home --shell /bin/false probo
RUN mkdir -p /home/probo/app
COPY . /home/probo/app
RUN chown -R probo:probo /home/probo/app

USER probo
RUN cd /home/probo/app/ && npm install

WORKDIR /home/probo/app

EXPOSE 3060

VOLUME ["/opt/db"]

CMD ["bin/loom"]
6 changes: 3 additions & 3 deletions bin/loom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ var loaderAddOptions = {
deepMerge: configKeys,
};

loader.add(path.resolve(path.join(__dirname, '..', 'defaults.yaml')), loaderAddOptions);
loader.addAndNormalizeObject(process.env, loaderAddOptions);
loader.add(path.resolve(path.join(__dirname, '..', 'defaults.yaml')));
loader.addAndNormalizeObject(process.env);

if (argv.config) {
if (typeof argv.config === 'string') {
Expand All @@ -69,7 +69,7 @@ if (argv.config) {
}
}

loader.addAndNormalizeObject(argv, loaderAddOptions);
loader.addAndNormalizeObject(argv);

var cachedConfig = null;
module.exports = {
Expand Down
9 changes: 5 additions & 4 deletions lib/api/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Server {
configure(config) {
var server = this.server;
// Extend logger using the plugin.
server.use(restify.requestLogger({
server.use(restify.plugins.requestLogger({
serializers: restify.bunyan.serializers,
}));
server.use(function(req, res, next) {
Expand All @@ -27,8 +27,9 @@ class Server {
this.log = this.server.log;
this.listen = this.server.listen;
this.close = this.server.close;
server.on('after', restify.auditLogger({
server.on('after', restify.plugins.auditLogger({
log: server.log,
event: 'after'
}));
server.on('uncaughtException', function(req, res, route, err) {
console.log('uncaughtException', err.stack);
Expand All @@ -42,11 +43,11 @@ class Server {
next();
});

server.use(restify.queryParser({mapParams: false}));
server.use(restify.plugins.queryParser({mapParams: false}));

routes.configure(server, config);

server.use(restify.queryParser({mapParams: false}));
server.use(restify.plugins.queryParser({mapParams: false}));
}

}
Expand Down
Loading