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/6] 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/6] 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/6] 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 7204ce811d6432ee44ba09228bdf6ee0bb437fc7 Mon Sep 17 00:00:00 2001 From: koromerzhin <308012+koromerzhin@users.noreply.github.com> Date: Wed, 9 Feb 2022 09:40:40 +0100 Subject: [PATCH 4/6] fix(docker): use official image --- docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7578405..339b8de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,5 +19,7 @@ services: deploy: labels: - "traefik.enable=true" - - "traefik.http.routers.quasar.rule=HostRegexp(`quasar.traefik.me`, `quasar.{ip:.*}.traefik.me`)" + - "traefik.http.routers.quasar.rule=Host(`quasar.traefik.me`)" + - "traefik.http.routers.quasar-tls.tls.domains[0].main=quasar.traefik.me" + - "traefik.http.routers.quasar.tls=true" - "traefik.http.services.quasar.loadbalancer.server.port=80" From 1972c45b75b5f66b2fa32a6f42f73a2c1aa3fd4c Mon Sep 17 00:00:00 2001 From: koromerzhin <308012+koromerzhin@users.noreply.github.com> Date: Tue, 3 May 2022 10:53:18 +0200 Subject: [PATCH 5/6] fix(doc): to download --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index f3e5f88..aa514ea 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,14 @@ Hosts: - quasar.traefik.me +## Download + +```sh +git clone git@github.com:koromerzhin/template-quasar.git template-quasar +cd template-quasar +git submodule update --init +``` + ## Install ``` sh From 3fb290427563243979d7d1779e3bfc6cd938f343 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 01:52:41 +0000 Subject: [PATCH 6/6] chore(deps): bump moment from 2.29.1 to 2.29.3 in /apps Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.3. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/2.29.3/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.29.1...2.29.3) --- updated-dependencies: - dependency-name: moment dependency-type: indirect ... Signed-off-by: dependabot[bot] --- 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..ee826a4 100644 --- a/apps/package-lock.json +++ b/apps/package-lock.json @@ -8077,9 +8077,9 @@ "dev": true }, "moment": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", - "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==", + "version": "2.29.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz", + "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==", "dev": true }, "move-concurrently": {