From 6adddf1b4142034e758137dfc568599466e79c23 Mon Sep 17 00:00:00 2001 From: purple_emily Date: Sun, 4 Feb 2024 18:29:40 +0000 Subject: [PATCH] Possible example of a utility package -- everything compiles but nothing transferred yet --- docker-compose.yaml | 4 ++-- src/node/addon/Dockerfile | 14 ++++++++++++-- src/node/addon/package-lock.json | 8 ++++++++ src/node/addon/package.json | 1 + src/node/utility/package.json | 9 +++++++++ 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 src/node/utility/package.json diff --git a/docker-compose.yaml b/docker-compose.yaml index 019b0f15..e52f1914 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -104,8 +104,8 @@ services: addon: build: - context: src/node/addon - dockerfile: Dockerfile + context: src/node + dockerfile: addon/Dockerfile ports: - "7000:7000" env_file: diff --git a/src/node/addon/Dockerfile b/src/node/addon/Dockerfile index 78f37af8..8c2109f9 100644 --- a/src/node/addon/Dockerfile +++ b/src/node/addon/Dockerfile @@ -6,11 +6,20 @@ RUN apk update && apk upgrade && \ WORKDIR /app -COPY package*.json ./ +COPY ./addon/package*.json ./ RUN npm install -COPY . . +COPY ./addon/ . RUN npm run build +# Create the utility package + +WORKDIR /utility + +COPY ./utility/package*.json ./ +RUN npm install +COPY ./utility/ . +# RUN npm run build + # --- Runtime Stage --- FROM node:lts-alpine @@ -22,6 +31,7 @@ WORKDIR /app ENV NODE_ENV production COPY --from=builder /app ./ +COPY --from=builder /utility /utility RUN npm prune --omit=dev EXPOSE 7000 diff --git a/src/node/addon/package-lock.json b/src/node/addon/package-lock.json index 32cb4a5e..cc8789fa 100644 --- a/src/node/addon/package-lock.json +++ b/src/node/addon/package-lock.json @@ -18,6 +18,7 @@ "debrid-link-api": "^1.0.1", "express-rate-limit": "^6.7.0", "ip": "^1.1.8", + "knightcrawler-utility": "file:../utility", "magnet-uri": "^6.2.0", "name-to-imdb": "^3.0.4", "named-queue": "^2.2.1", @@ -50,6 +51,9 @@ "tsx": "^4.7.0" } }, + "../utility": { + "version": "0.0.1" + }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", @@ -3615,6 +3619,10 @@ "json-buffer": "3.0.1" } }, + "node_modules/knightcrawler-utility": { + "resolved": "../utility", + "link": true + }, "node_modules/levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", diff --git a/src/node/addon/package.json b/src/node/addon/package.json index d062dd27..97aafaab 100644 --- a/src/node/addon/package.json +++ b/src/node/addon/package.json @@ -19,6 +19,7 @@ "debrid-link-api": "^1.0.1", "express-rate-limit": "^6.7.0", "ip": "^1.1.8", + "knightcrawler-utility": "file:../utility", "magnet-uri": "^6.2.0", "name-to-imdb": "^3.0.4", "named-queue": "^2.2.1", diff --git a/src/node/utility/package.json b/src/node/utility/package.json new file mode 100644 index 00000000..a033afbd --- /dev/null +++ b/src/node/utility/package.json @@ -0,0 +1,9 @@ +{ + "name": "knightcrawler-utility", + "version": "0.0.1", + "description": "A collection of utility scripts and configurations for the Knight Crawler addon and consumer.", + "type": "module", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + } +}