From 1fa55dba4e2c5f82dac2c98b86d6e981599bbcc2 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 2 Nov 2023 12:13:05 -0600 Subject: [PATCH 1/3] fix/ci: remove armv7 because it takes years [docker build] --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 3e36a49..4753886 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -33,7 +33,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm/v7 + platforms: linux/amd64,linux/arm64 push: true build-args: | COMMIT_TAG=${{ github.sha }} From efdb10b482449a1a01b36e227295b6aafbcc4d55 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Fri, 3 Nov 2023 18:32:08 -0600 Subject: [PATCH 2/3] fix: look for server.json in .ass-data dir [docker build] --- backend/app.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/app.ts b/backend/app.ts index 4c3619b..45afb53 100644 --- a/backend/app.ts +++ b/backend/app.ts @@ -92,11 +92,11 @@ async function main() { // Replace with user details, if necessary try { - const exists = await fs.pathExists(path.join('server.json')); + const exists = await fs.pathExists(path.join('.ass-data/server.json')); if (exists) { // Read file - const { host, port, proxied } = await fs.readJson(path.join('server.json')) as { host?: string, port?: number, proxied?: boolean }; + const { host, port, proxied } = await fs.readJson(path.join('.ass-data/server.json')) as { host?: string, port?: number, proxied?: boolean }; // Set details, if available if (host) serverConfig.host = host; From 04ed201873eb1f790726650ddb8184fe0b2f8aa9 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Fri, 3 Nov 2023 18:57:04 -0600 Subject: [PATCH 3/3] build: update axios for security, remove tw types --- package-lock.json | 19 ++++--------------- package.json | 3 +-- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 64360a1..8095e15 100755 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "any-shell-escape": "^0.1.1", "autoprefixer": "^10.4.16", "aws-sdk": "^2.1467.0", - "axios": "^1.5.1", + "axios": "^1.6.0", "bcrypt": "^5.1.1", "chalk": "^4.1.2", "check-node-version": "^4.2.1", @@ -58,7 +58,6 @@ "@types/node-fetch": "^2.5.12", "@types/sharp": "^0.30.2", "@types/stream-to-array": "^2.3.0", - "@types/tailwindcss": "^3.0.9", "@types/uuid": "^8.3.1", "@types/ws": "^7.4.7" }, @@ -1272,16 +1271,6 @@ "@types/node": "*" } }, - "node_modules/@types/tailwindcss": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@types/tailwindcss/-/tailwindcss-3.1.0.tgz", - "integrity": "sha512-JxPzrm609hzvF4nmOI3StLjbBEP3WWQxDDJESqR1nh94h7gyyy3XSl0hn5RBMJ9mPudlLjtaXs5YEBtLw7CnPA==", - "deprecated": "This is a stub types definition. tailwindcss provides its own type definitions, so you do not need this installed.", - "dev": true, - "dependencies": { - "tailwindcss": "*" - } - }, "node_modules/@types/uuid": { "version": "8.3.4", "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz", @@ -1616,9 +1605,9 @@ } }, "node_modules/axios": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz", - "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", + "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", "dependencies": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", diff --git a/package.json b/package.json index 6418220..457eaf0 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "any-shell-escape": "^0.1.1", "autoprefixer": "^10.4.16", "aws-sdk": "^2.1467.0", - "axios": "^1.5.1", + "axios": "^1.6.0", "bcrypt": "^5.1.1", "chalk": "^4.1.2", "check-node-version": "^4.2.1", @@ -91,7 +91,6 @@ "@types/node-fetch": "^2.5.12", "@types/sharp": "^0.30.2", "@types/stream-to-array": "^2.3.0", - "@types/tailwindcss": "^3.0.9", "@types/uuid": "^8.3.1", "@types/ws": "^7.4.7" }