Skip to content

Commit

Permalink
Feature/846 async logging (#100)
Browse files Browse the repository at this point in the history
* Add file logging support in docker, update dependencies

* Add back missing package after merge conflicts
  • Loading branch information
lewisdaly authored and shashi165 committed Dec 5, 2019
1 parent b36efd3 commit 6567058
Show file tree
Hide file tree
Showing 4 changed files with 167 additions and 95 deletions.
12 changes: 10 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM node:10.15.3-alpine
FROM node:10.15.3-alpine as builder

WORKDIR /opt/quoting-service

RUN apk add --no-cache -t build-dependencies git make gcc g++ python libtool autoconf automake \
Expand All @@ -8,12 +9,19 @@ RUN apk add --no-cache -t build-dependencies git make gcc g++ python libtool aut

COPY package.json package-lock.json* /opt/quoting-service/

RUN npm install --production
RUN npm install

RUN apk del build-dependencies

COPY config /opt/quoting-service/config
COPY src /opt/quoting-service/src

FROM node:10.15.3-alpine

WORKDIR /opt/quoting-service

COPY --from=builder /opt/quoting-service .
RUN npm prune --production

EXPOSE 3002
CMD ["npm", "run", "start"]
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ services:
container_name: qs_quoting-service
ports:
- "3002:3002"
environment:
- CSL_LOG_TRANSPORT=file
volumes:
- ./docker/quoting-service/default.json:/opt/quoting-service/config/default.json
242 changes: 150 additions & 92 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "quoting-service",
"description": "Quoting Service hosted by a scheme",
"license": "Apache-2.0",
"version": "8.6.1-snapshot",
"version": "8.6.2-snapshot",
"author": "Modusbox",
"contributors": [
"James Bush <james.bush@modusbox.com>",
Expand Down Expand Up @@ -50,7 +50,11 @@
"@hapi/hapi": "18.4.0",
"@mojaloop/central-services-error-handling": "8.6.2",
"@mojaloop/central-services-logger": "8.6.0",
<<<<<<< feature/mowdev-3411
"@mojaloop/central-services-shared": "8.6.3",
=======
"@mojaloop/central-services-shared": "8.6.2",
>>>>>>> Feature/846 async logging (#100)
"@mojaloop/event-sdk": "8.6.1",
"@mojaloop/ml-number": "8.2.0",
"axios": "0.19.0",
Expand Down

0 comments on commit 6567058

Please sign in to comment.