From 684e7c4ddbb10e88ead1d33e93f97fc7dcb0db25 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Thu, 3 Dec 2020 17:12:27 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9A=99=20settings=20-=20standard=20impor?= =?UTF-8?q?ts=20+=20quote=20formatting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 812953b..bc63ed0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -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" } \ No newline at end of file From ee35da7342de601650052eae13bc773831ea9ad7 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 3 Dec 2020 18:48:24 +0100 Subject: [PATCH 2/2] Fixxed dockerfile --- Dockerfile | 2 +- docker-compose.yml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index da54cd5..089c4de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:alpine WORKDIR /app COPY ./package.json ./ -RUN npm i +RUN yarn COPY ./ ./ ENTRYPOINT [ "yarn","dev" ] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 1efd5ba..7ca0bb8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 \ No newline at end of file + POSTGRES_USER: lfk + ports: + - 5432:5432 \ No newline at end of file