Merge branch 'dev' into feature/13-runner_controllers
This commit is contained in:
commit
0d5a2109d5
6
.vscode/settings.json
vendored
6
.vscode/settings.json
vendored
@ -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"
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
FROM node:alpine
|
||||
WORKDIR /app
|
||||
COPY ./package.json ./
|
||||
RUN npm i
|
||||
RUN yarn
|
||||
COPY ./ ./
|
||||
ENTRYPOINT [ "yarn","dev" ]
|
@ -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
|
||||
POSTGRES_USER: lfk
|
||||
ports:
|
||||
- 5432:5432
|
Loading…
x
Reference in New Issue
Block a user