From 2374fd73479417b2e8fb9cb13dd3771147d2806e Mon Sep 17 00:00:00 2001 From: tanshu Date: Thu, 18 Mar 2021 07:11:41 +0530 Subject: [PATCH] Chore: Updated angular and other javascript dependencies --- bookie/.eslintrc.json | 5 ++- bookie/package.json | 70 ++++++++++++++++++------------------- docker/files/chd-worker.env | 3 ++ docker/files/pkl-worker.env | 3 ++ docker/playbook-chd.yml | 7 +++- docker/playbook-pkl.yml | 7 +++- docker/playbook.yml | 7 +++- 7 files changed, 63 insertions(+), 39 deletions(-) create mode 100644 docker/files/chd-worker.env create mode 100644 docker/files/pkl-worker.env diff --git a/bookie/.eslintrc.json b/bookie/.eslintrc.json index 354a261..a6f18b5 100644 --- a/bookie/.eslintrc.json +++ b/bookie/.eslintrc.json @@ -49,7 +49,10 @@ "import/order": [ "error", { - "alphabetize": {"order": "asc", "caseInsensitive": true}, + "alphabetize": { + "order": "asc", + "caseInsensitive": true + }, "newlines-between": "always" } ], diff --git a/bookie/package.json b/bookie/package.json index 355c49b..6a88b3e 100644 --- a/bookie/package.json +++ b/bookie/package.json @@ -14,56 +14,56 @@ }, "private": true, "dependencies": { - "@angular/animations": "^11.1.0", - "@angular/cdk": "^11.1.0", - "@angular/common": "^11.1.0", - "@angular/compiler": "^11.1.0", - "@angular/core": "^11.1.0", + "@angular/animations": "^11.2.6", + "@angular/cdk": "^11.2.5", + "@angular/common": "^11.2.6", + "@angular/compiler": "^11.2.6", + "@angular/core": "^11.2.6", "@angular/flex-layout": "^11.0.0-beta.33", - "@angular/forms": "^11.1.0", - "@angular/material": "^11.1.0", - "@angular/material-moment-adapter": "^11.1.0", - "@angular/platform-browser": "^11.1.0", - "@angular/platform-browser-dynamic": "^11.1.0", - "@angular/router": "^11.1.0", - "mathjs": "^9.0.0", + "@angular/forms": "^11.2.6", + "@angular/material": "^11.2.5", + "@angular/material-moment-adapter": "^11.2.5", + "@angular/platform-browser": "^11.2.6", + "@angular/platform-browser-dynamic": "^11.2.6", + "@angular/router": "^11.2.6", + "mathjs": "^9.3.0", "moment": "^2.29.1", - "rxjs": "^6.6.3", + "rxjs": "^6.6.6", "tslib": "^2.1.0", - "zone.js": "^0.11.3" + "zone.js": "^0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1101.1", - "@angular-eslint/builder": "^1.1.0", - "@angular-eslint/eslint-plugin": "^1.1.0", - "@angular-eslint/eslint-plugin-template": "^1.1.0", - "@angular-eslint/schematics": "^1.1.0", - "@angular-eslint/template-parser": "^1.1.0", - "@angular/cli": "^11.1.1", - "@angular/compiler-cli": "^11.1.0", - "@angular/language-service": "^11.1.0", - "@types/jasmine": "~3.6.3", + "@angular-devkit/build-angular": "~0.1102.5", + "@angular-eslint/builder": "^2.0.0", + "@angular-eslint/eslint-plugin": "^2.0.0", + "@angular-eslint/eslint-plugin-template": "^2.0.0", + "@angular-eslint/schematics": "^2.0.2", + "@angular-eslint/template-parser": "^2.0.0", + "@angular/cli": "^11.2.5", + "@angular/compiler-cli": "^11.2.6", + "@angular/language-service": "^11.2.6", + "@types/jasmine": "~3.6.7", "@types/mathjs": "^6.0.11", - "@types/node": "^14.14.22", - "@typescript-eslint/eslint-plugin": "^4.14.0", - "@typescript-eslint/parser": "^4.14.0", - "eslint": "^7.18.0", + "@types/node": "^14.14.35", + "@typescript-eslint/eslint-plugin": "4.18.0", + "@typescript-eslint/parser": "4.18.0", + "eslint": "^7.22.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-jsdoc": "^31.2.2", - "eslint-plugin-prefer-arrow": "1.2.2", - "husky": "^4.3.8", + "eslint-plugin-jsdoc": "^32.3.0", + "eslint-plugin-prefer-arrow": "1.2.3", + "husky": "^5.1.3", "jasmine-core": "^3.6.0", "jasmine-spec-reporter": "^6.0.0", - "karma": "^6.0.1", + "karma": "^6.2.0", "karma-chrome-launcher": "~3.1.0", "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "^4.0.0", "karma-jasmine-html-reporter": "^1.5.0", - "lint-staged": "^10.5.3", + "lint-staged": "^10.5.4", "prettier": "^2.2.1", - "standard-version": "^9.1.0", + "standard-version": "^9.1.1", "ts-node": "^9.1.1", - "typescript": "^4.1.3" + "typescript": "~4.1.5" }, "husky": { "hooks": { diff --git a/docker/files/chd-worker.env b/docker/files/chd-worker.env new file mode 100644 index 0000000..c121668 --- /dev/null +++ b/docker/files/chd-worker.env @@ -0,0 +1,3 @@ +WORKER_REDIS_HOST=redis +WORKER_REDIS_PORT=6379 +WORKER_QUEUE_NAME="DJ Computer" diff --git a/docker/files/pkl-worker.env b/docker/files/pkl-worker.env new file mode 100644 index 0000000..eb55140 --- /dev/null +++ b/docker/files/pkl-worker.env @@ -0,0 +1,3 @@ +WORKER_REDIS_HOST=redis +WORKER_REDIS_PORT=6379 +WORKER_QUEUE_NAME="Ground Floor Printer" diff --git a/docker/playbook-chd.yml b/docker/playbook-chd.yml index 146595b..ceac287 100755 --- a/docker/playbook-chd.yml +++ b/docker/playbook-chd.yml @@ -36,6 +36,11 @@ src: "files/chd.env" dest: "/var/lib/{{ host_directory }}/.env" + - name: Upload the worker .env file + template: + src: "files/chd-worker.env" + dest: "/var/lib/{{ host_directory }}/worker.env" + - name: Create barker container docker_container: name: "{{ host_directory }}" @@ -57,7 +62,7 @@ image: barker-worker:latest state: started restart_policy: "unless-stopped" - env_file: "/var/lib/{{ host_directory }}/.env" + env_file: "/var/lib/{{ host_directory }}/worker.env" links: - "redis:redis" diff --git a/docker/playbook-pkl.yml b/docker/playbook-pkl.yml index f35c350..5639819 100755 --- a/docker/playbook-pkl.yml +++ b/docker/playbook-pkl.yml @@ -36,6 +36,11 @@ src: "files/pkl.env" dest: "/var/lib/{{ host_directory }}/.env" + - name: Upload the worker .env file + template: + src: "files/pkl-worker.env" + dest: "/var/lib/{{ host_directory }}/worker.env" + - name: Create barker container docker_container: name: "{{ host_directory }}" @@ -57,7 +62,7 @@ image: barker-worker:latest state: started restart_policy: "unless-stopped" - env_file: "/var/lib/{{ host_directory }}/.env" + env_file: "/var/lib/{{ host_directory }}/worker.env" links: - "redis:redis" diff --git a/docker/playbook.yml b/docker/playbook.yml index 0d5e77f..4dbaa2e 100755 --- a/docker/playbook.yml +++ b/docker/playbook.yml @@ -36,6 +36,11 @@ src: "files/.env" dest: "/var/lib/{{ host_directory }}/.env" + - name: Upload the worker .env file + template: + src: "files/worker.env" + dest: "/var/lib/{{ host_directory }}/worker.env" + - name: Create barker container docker_container: name: "{{ host_directory }}" @@ -57,7 +62,7 @@ image: barker-worker:latest state: started restart_policy: "unless-stopped" - env_file: "/var/lib/{{ host_directory }}/.env" + env_file: "/var/lib/{{ host_directory }}/worker.env" links: - "redis:redis"