From 2edbe0bd62ae3151ac525db97b458bce9599b109 Mon Sep 17 00:00:00 2001
From: Le TOULLEC Martial <308012+koromerzhin@users.noreply.github.com>
Date: Fri, 4 Feb 2022 15:03:27 +0100
Subject: [PATCH 1/4] Update docker-compose.yml

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4b0d2ec..fe2518a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ networks:
     attachable: true
 services:
   exec:
-    image: koromerzhin/nodejs:1.1.3-quasar
+    image: koromerzhin/quasar:1.1.3
     volumes:
       - ${PWD}/apps:/app
     command: sh -c "npm install"

From 1991c1ca54161e8779b47f09517512d04fd48729 Mon Sep 17 00:00:00 2001
From: Le TOULLEC Martial <308012+koromerzhin@users.noreply.github.com>
Date: Tue, 8 Feb 2022 11:17:53 +0100
Subject: [PATCH 2/4] Update docker-compose.yml

---
 docker-compose.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index fe2518a..7cc045a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,18 +6,11 @@ networks:
     driver: overlay
     attachable: true
 services:
-  exec:
-    image: koromerzhin/quasar:1.1.3
-    volumes:
-      - ${PWD}/apps:/app
-    command: sh -c "npm install"
-    deploy:
-      restart_policy:
-        condition: none
-      labels:
-        - "traefik.enable=false"
   www:
-    image: koromerzhin/nodejs:1.1.3-quasar
+    image: node:15.14.0
+    working_dir: /app
+    command: >
+      sh -c "npm install -g @quasar/cli@1.2.2 && npm install && quasar dev"
     volumes:
       - ${PWD}/apps:/app
     networks:

From e7d5dd4b07c26cadebae7d3e07a45379a8371607 Mon Sep 17 00:00:00 2001
From: koromerzhin <308012+koromerzhin@users.noreply.github.com>
Date: Tue, 8 Feb 2022 11:34:40 +0100
Subject: [PATCH 3/4] fix(quasar): use npm run start

---
 apps/package.json  | 2 ++
 docker-compose.yml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/package.json b/apps/package.json
index e8ac90f..aa437b2 100644
--- a/apps/package.json
+++ b/apps/package.json
@@ -6,6 +6,8 @@
   "author": "koromerzhin <308012+koromerzhin@users.noreply.github.com>",
   "private": true,
   "scripts": {
+    "start": "quasar dev",
+    "build": "quasar build",
     "lint": "eslint --ext .js,.vue ./",
     "test": "echo \"No test specified\" && exit 0"
   },
diff --git a/docker-compose.yml b/docker-compose.yml
index 7cc045a..7578405 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     image: node:15.14.0
     working_dir: /app
     command: >
-      sh -c "npm install -g @quasar/cli@1.2.2 && npm install && quasar dev"
+      sh -c "npm install -g @quasar/cli@1.2.2 && npm install && npm run start"
     volumes:
       - ${PWD}/apps:/app
     networks:

From d7db2e75f13377604e3e2e1aa55069bd32ceb454 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Feb 2022 10:36:44 +0000
Subject: [PATCH 4/4] chore(deps): bump tar from 6.1.0 to 6.1.11 in /apps

Bumps [tar](https://github.com/npm/node-tar) from 6.1.0 to 6.1.11.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.0...v6.1.11)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/package-lock.json b/apps/package-lock.json
index fdbbbfa..05ae721 100644
--- a/apps/package-lock.json
+++ b/apps/package-lock.json
@@ -11477,9 +11477,9 @@
       "dev": true
     },
     "tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "dev": true,
       "requires": {
         "chownr": "^2.0.0",