Merge branch 'dev' into feature/13-runner_controllers

This commit is contained in:
Nicolai Ort 2020-12-03 18:50:11 +01:00
commit 0d5a2109d5
3 changed files with 10 additions and 3 deletions

View File

@ -8,5 +8,9 @@
"prettier.enable": false,
"[typescript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
}
},
"javascript.preferences.quoteStyle": "single",
"javascript.preferences.importModuleSpecifierEnding": "minimal",
"typescript.preferences.importModuleSpecifierEnding": "minimal",
"typescript.preferences.includePackageJsonAutoImports": "on"
}

View File

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

View File

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