Merge branch 'dev' into feature/14-user-controllers

This commit is contained in:
Philipp Dormann 2020-12-03 19:00:44 +01:00
commit a191d8ca2e
3 changed files with 16 additions and 5 deletions

View File

@ -1,6 +1,6 @@
FROM node:alpine FROM node:alpine
WORKDIR /app WORKDIR /app
COPY ./package.json ./ COPY ./package.json ./
RUN npm i RUN yarn
COPY ./ ./ COPY ./ ./
ENTRYPOINT [ "yarn","dev" ] ENTRYPOINT [ "yarn","dev" ]

View File

@ -12,9 +12,12 @@ services:
DB_USER: lfk DB_USER: lfk
DB_PASSWORD: changeme DB_PASSWORD: changeme
DB_NAME: lfk DB_NAME: lfk
NODE_ENV: production
backend_db: backend_db:
image: postgres:11-alpine image: postgres:11-alpine
environment: environment:
POSTGRES_DB: lfk POSTGRES_DB: lfk
POSTGRES_PASSWORD: changeme POSTGRES_PASSWORD: changeme
POSTGRES_USER: lfk POSTGRES_USER: lfk
ports:
- 5432:5432

View File

@ -1,12 +1,20 @@
{ {
"compilerOptions": { "compilerOptions": {
"target": "es2017", "target": "ES2020",
"module": "commonjs", "module": "commonjs",
"rootDir": "./src", "rootDir": "./src",
"outDir": "./build", "outDir": "./build",
"esModuleInterop": true, "esModuleInterop": true,
"strict": false, "strict": false,
"experimentalDecorators": true, "experimentalDecorators": true,
"emitDecoratorMetadata": true "emitDecoratorMetadata": true,
} "sourceMap": false
},
"include": [
"src/**/*"
],
"exclude": [
"node_modules",
"**/*.spec.ts"
]
} }