From d3a5917bb913b301ecf35988b8db02e0f5c0414e Mon Sep 17 00:00:00 2001 From: toast-ts <96593068+toast-ts@users.noreply.github.com> Date: Tue, 19 Mar 2024 20:07:06 +1100 Subject: [PATCH 1/8] Fix database refusing to start --- docker-compose.bot.yml | 2 +- docker-compose.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker-compose.bot.yml b/docker-compose.bot.yml index 93285ee..6e6197c 100644 --- a/docker-compose.bot.yml +++ b/docker-compose.bot.yml @@ -1,6 +1,6 @@ services: bot: - container_name: daggerbot-prod + container_name: daggerbot build: . restart: unless-stopped volumes: diff --git a/docker-compose.yml b/docker-compose.yml index f25b3a0..fc3cfb4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,15 +6,13 @@ services: ports: - 6379:6379/tcp db: - container_name: postgres-master + container_name: postgres image: postgres:16.2-alpine3.19 restart: unless-stopped ports: - 5432:5432/tcp volumes: - /var/lib/docker/volumes/daggerbot-db:/var/lib/postgresql/data:rw - - ./postgres-replica-stuff/configs/postgres-hba.conf:/var/lib/postgresql/data/pg_hba.conf:rw - - ./postgres-replica-stuff/configs/postgres.conf:/var/lib/postgresql/data/postgresql.conf:rw environment: POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} From 393df911c4b6de2402bb4aca1e20fc2053d8b72a Mon Sep 17 00:00:00 2001 From: toast-ts <96593068+toast-ts@users.noreply.github.com> Date: Tue, 19 Mar 2024 20:10:54 +1100 Subject: [PATCH 2/8] Update image for Redis container and fix naming --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fc3cfb4..f9e2755 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,12 @@ services: cache: - container_name: redis-cache - image: redis/redis-stack-server:7.2.0-v6 + container_name: daggerbot-redis + image: redis/redis-stack-server:7.2.0-v9 restart: unless-stopped ports: - 6379:6379/tcp db: - container_name: postgres + container_name: daggerbot-postgres image: postgres:16.2-alpine3.19 restart: unless-stopped ports: From a7802e5e7880c7a71cc6a0d2fdd4fc69305d013e Mon Sep 17 00:00:00 2001 From: toast-ts <96593068+toast-ts@users.noreply.github.com> Date: Tue, 19 Mar 2024 20:13:21 +1100 Subject: [PATCH 3/8] Remove unused variable in Postgres --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f9e2755..7e4711a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,6 @@ services: volumes: - /var/lib/docker/volumes/daggerbot-db:/var/lib/postgresql/data:rw environment: - POSTGRES_USER: ${POSTGRES_USER} + #POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_DB: ${POSTGRES_DB} From 130c499bfc72004dcc0e36c1287b04c86a00e006 Mon Sep 17 00:00:00 2001 From: Amberlyn <163978719+pomni32@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:43:09 +1100 Subject: [PATCH 4/8] Rename Bot Tech as it no longer exists (#104) --- src/commands/suggest.ts | 4 ++-- src/commands/tag.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commands/suggest.ts b/src/commands/suggest.ts index 3944b54..1e88ecc 100644 --- a/src/commands/suggest.ts +++ b/src/commands/suggest.ts @@ -54,14 +54,14 @@ export default class Suggest { .setRequired(true))) .addSubcommand(x=>x .setName('delete') - .setDescription('Delete a suggestion (Bot Tech only)') + .setDescription('Delete a suggestion (Bot devs only)') .addIntegerOption(x=>x .setName('id') .setDescription('The ID of the suggestion') .setRequired(true))) .addSubcommand(x=>x .setName('update') - .setDescription('Update a suggestion (Bot Tech only)') + .setDescription('Update a suggestion (Bot devs only)') .addIntegerOption(x=>x .setName('id') .setDescription('The ID of the suggestion') diff --git a/src/commands/tag.ts b/src/commands/tag.ts index cb19351..8335e6d 100644 --- a/src/commands/tag.ts +++ b/src/commands/tag.ts @@ -42,7 +42,7 @@ export default class Tag { .setRequired(false))) .addSubcommandGroup(x=>x .setName('tools') - .setDescription('Management tools for the tags system (Discord mods & Bot Tech only)') + .setDescription('Management tools for the tags system (Discord mods & bot devs only)') .addSubcommand(x=>x .setName('create') .setDescription('Create a new tag') From eb776c0f5a17e2ae74f50c2748fb83408a7103bc Mon Sep 17 00:00:00 2001 From: Toast <96593068+toast-ts@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:45:49 +1100 Subject: [PATCH 5/8] Update dependabot.yml --- .github/dependabot.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9920151..32521d6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,8 +19,6 @@ updates: timezone: "Australia/NSW" assignees: - "toast-ts" - reviewers: - - "toast-ts" labels: - "dependencies" open-pull-requests-limit: 8 From 5fd3cf89ce7c0755dbed0bad311996ad82ae451d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:46:37 +1100 Subject: [PATCH 6/8] Combined Dependabot PR (#105) * Bump systeminformation from 5.22.3 to 5.22.5 Bumps [systeminformation](https://github.com/sebhildebrandt/systeminformation) from 5.22.3 to 5.22.5. - [Changelog](https://github.com/sebhildebrandt/systeminformation/blob/master/CHANGELOG.md) - [Commits](https://github.com/sebhildebrandt/systeminformation/compare/v5.22.3...v5.22.5) --- updated-dependencies: - dependency-name: systeminformation dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump @types/node from 20.11.28 to 20.11.29 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.28 to 20.11.29. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- package.json | 4 ++-- yarn.lock | 23 ++++++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 6ee44ad..7a2ee1f 100644 --- a/package.json +++ b/package.json @@ -42,12 +42,12 @@ "redis": "4.6.13", "sequelize": "6.37.1", "simple-git": "3.23.0", - "systeminformation": "5.22.3", + "systeminformation": "5.22.5", "undici": "6.9.0" }, "devDependencies": { "@types/ms": "0.7.34", - "@types/node": "20.11.28", + "@types/node": "20.11.29", "@types/node-cron": "3.0.11", "@types/pg": "8.11.2", "@types/sequelize": "4.28.20", diff --git a/yarn.lock b/yarn.lock index 0c0e531..3cedd44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -482,7 +482,7 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:20.11.28": +"@types/node@npm:*": version: 20.11.28 resolution: "@types/node@npm:20.11.28" dependencies: @@ -491,6 +491,15 @@ __metadata: languageName: node linkType: hard +"@types/node@npm:20.11.29": + version: 20.11.29 + resolution: "@types/node@npm:20.11.29" + dependencies: + undici-types: "npm:~5.26.4" + checksum: 10/eca2c87c1e583bcd4d73dc7a49643c6b793008d8aeefb93ba22c84d70b61388d6cacf8c44af0fcd35820a92121249437689afe48f42b228e281ecc64c22b0a67 + languageName: node + linkType: hard + "@types/pg@npm:8.11.2": version: 8.11.2 resolution: "@types/pg@npm:8.11.2" @@ -589,7 +598,7 @@ __metadata: "@octokit/rest": "npm:20.0.2" "@toast/tokenservice-client": "npm:1.0.16" "@types/ms": "npm:0.7.34" - "@types/node": "npm:20.11.28" + "@types/node": "npm:20.11.29" "@types/node-cron": "npm:3.0.11" "@types/pg": "npm:8.11.2" "@types/sequelize": "npm:4.28.20" @@ -605,7 +614,7 @@ __metadata: redis: "npm:4.6.13" sequelize: "npm:6.37.1" simple-git: "npm:3.23.0" - systeminformation: "npm:5.22.3" + systeminformation: "npm:5.22.5" typescript: "npm:5.4.2" undici: "npm:6.9.0" languageName: unknown @@ -1146,12 +1155,12 @@ __metadata: languageName: node linkType: hard -"systeminformation@npm:5.22.3": - version: 5.22.3 - resolution: "systeminformation@npm:5.22.3" +"systeminformation@npm:5.22.5": + version: 5.22.5 + resolution: "systeminformation@npm:5.22.5" bin: systeminformation: lib/cli.js - checksum: 10/a4b0bf49e5319424c828aff805a7cf158235ec79407039acfa13133e9dcfe2b6121aaafeffec94cae45dc85899dd91fd00583a4bc018ed507d38a4aea7ae6459 + checksum: 10/65a5e0b90de67f7566a963f971737ecc6fcdac263590438a906dbca26b6e40c147ac1b59ede8b618dd86c492407740719bb9664c11eaf9fe8505332e8b78c3f5 conditions: (os=darwin | os=linux | os=win32 | os=freebsd | os=openbsd | os=netbsd | os=sunos | os=android) languageName: node linkType: hard From 49786315d8f13c0c0827544e4802be5c27296f34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:51:11 +1100 Subject: [PATCH 7/8] Bump @types/node from 20.11.28 to 20.11.30 (#106) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.28 to 20.11.30. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7a2ee1f..5bda561 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ }, "devDependencies": { "@types/ms": "0.7.34", - "@types/node": "20.11.29", + "@types/node": "20.11.30", "@types/node-cron": "3.0.11", "@types/pg": "8.11.2", "@types/sequelize": "4.28.20", diff --git a/yarn.lock b/yarn.lock index 3cedd44..3f5b92b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -491,12 +491,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:20.11.29": - version: 20.11.29 - resolution: "@types/node@npm:20.11.29" +"@types/node@npm:20.11.30": + version: 20.11.30 + resolution: "@types/node@npm:20.11.30" dependencies: undici-types: "npm:~5.26.4" - checksum: 10/eca2c87c1e583bcd4d73dc7a49643c6b793008d8aeefb93ba22c84d70b61388d6cacf8c44af0fcd35820a92121249437689afe48f42b228e281ecc64c22b0a67 + checksum: 10/78515bc768d2b878e2e06a1c20eb4f5840072b79b8d28ff3dd0a7feaaf48fd3a2ac03cfa5bc7564da82db5906b43e9ba0e5df9f43d870b7aae2942306e208815 languageName: node linkType: hard @@ -598,7 +598,7 @@ __metadata: "@octokit/rest": "npm:20.0.2" "@toast/tokenservice-client": "npm:1.0.16" "@types/ms": "npm:0.7.34" - "@types/node": "npm:20.11.29" + "@types/node": "npm:20.11.30" "@types/node-cron": "npm:3.0.11" "@types/pg": "npm:8.11.2" "@types/sequelize": "npm:4.28.20" From 2c2200895722e83bfde09a1cb43cf5e15a8bfc9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:55:26 +1100 Subject: [PATCH 8/8] Bump @types/pg from 8.11.2 to 8.11.3 (#102) Bumps [@types/pg](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/pg) from 8.11.2 to 8.11.3. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/pg) --- updated-dependencies: - dependency-name: "@types/pg" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5bda561..569b380 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@types/ms": "0.7.34", "@types/node": "20.11.30", "@types/node-cron": "3.0.11", - "@types/pg": "8.11.2", + "@types/pg": "8.11.3", "@types/sequelize": "4.28.20", "typescript": "5.4.2" } diff --git a/yarn.lock b/yarn.lock index 3f5b92b..4885289 100644 --- a/yarn.lock +++ b/yarn.lock @@ -500,14 +500,14 @@ __metadata: languageName: node linkType: hard -"@types/pg@npm:8.11.2": - version: 8.11.2 - resolution: "@types/pg@npm:8.11.2" +"@types/pg@npm:8.11.3": + version: 8.11.3 + resolution: "@types/pg@npm:8.11.3" dependencies: "@types/node": "npm:*" pg-protocol: "npm:*" pg-types: "npm:^4.0.1" - checksum: 10/7c05cf63beffc0f8d817d080cdd98d199a2bd732b779b9aadddcb8659f861f7aafb3bc071636b9eaa65b36cfe998ee66e21aa1485e583b190918fe2f856a6c53 + checksum: 10/7042872d971bbb6bd0e23dc566d1a415921855e4e4fa616189872f86ea0a3edda1bf33a87452daa299fc214b2eff312e394de5f52833a0e62e79126590f1f7b4 languageName: node linkType: hard @@ -600,7 +600,7 @@ __metadata: "@types/ms": "npm:0.7.34" "@types/node": "npm:20.11.30" "@types/node-cron": "npm:3.0.11" - "@types/pg": "npm:8.11.2" + "@types/pg": "npm:8.11.3" "@types/sequelize": "npm:4.28.20" ansi-colors: "npm:4.1.3" dayjs: "npm:1.11.10"