diff --git a/.dockerignore b/.dockerignore index c2ac2f1d..0973642f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -10,8 +10,7 @@ Dockerfile .wrangler data readme -deploy/worker/* -!deploy/worker/package.json +deploy/worker docker-compose.yml wrangler.toml *.md diff --git a/Dockerfile b/Dockerfile index 4d04b260..cc4342f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,7 @@ FROM node:22-slim AS dependencies WORKDIR /app COPY package.json package-lock.json ./ -COPY deploy/common/package.json ./deploy/common/package.json -COPY deploy/server/package.json ./deploy/server/package.json -COPY deploy/worker/package.json ./deploy/worker/package.json +COPY deploy/profiles ./deploy/profiles RUN apt-get update && \ apt-get install -y --no-install-recommends python3 make g++ && \ @@ -24,6 +22,7 @@ ENV NODE_ENV=production COPY --from=dependencies /app/node_modules ./node_modules COPY package.json ./ +COPY deploy/profiles ./deploy/profiles COPY frontend-dist ./frontend-dist COPY functions ./functions COPY database ./database diff --git a/deploy/common/package.json b/deploy/profiles/common/package.json similarity index 100% rename from deploy/common/package.json rename to deploy/profiles/common/package.json diff --git a/deploy/server/package.json b/deploy/profiles/server/package.json similarity index 100% rename from deploy/server/package.json rename to deploy/profiles/server/package.json diff --git a/deploy/worker/package.json b/deploy/profiles/worker/package.json similarity index 100% rename from deploy/worker/package.json rename to deploy/profiles/worker/package.json diff --git a/package-lock.json b/package-lock.json index 91bf0c0b..e0f01911 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,9 +8,7 @@ "name": "cloudflare-imgbed", "version": "2.7.5", "workspaces": [ - "deploy/common", - "deploy/server", - "deploy/worker" + "deploy/profiles/*" ], "devDependencies": { "concurrently": "^8.2.2", @@ -20,13 +18,13 @@ "wrangler": "^4.24.0" } }, - "deploy/common": { + "deploy/profiles/common": { "name": "@cloudflare-imgbed/common", "dependencies": { "@aws-sdk/client-s3": "3.726.1" } }, - "deploy/server": { + "deploy/profiles/server": { "name": "@cloudflare-imgbed/server", "dependencies": { "@hono/node-server": "^1.13.8", @@ -35,7 +33,7 @@ "sharp": "0.34.5" } }, - "deploy/worker": { + "deploy/profiles/worker": { "name": "@cloudflare-imgbed/worker", "dependencies": { "@cloudflare/pages-plugin-sentry": "^1.1.3", @@ -1330,15 +1328,15 @@ } }, "node_modules/@cloudflare-imgbed/common": { - "resolved": "deploy/common", + "resolved": "deploy/profiles/common", "link": true }, "node_modules/@cloudflare-imgbed/server": { - "resolved": "deploy/server", + "resolved": "deploy/profiles/server", "link": true }, "node_modules/@cloudflare-imgbed/worker": { - "resolved": "deploy/worker", + "resolved": "deploy/profiles/worker", "link": true }, "node_modules/@cloudflare/kv-asset-handler": { diff --git a/package.json b/package.json index 6d795d90..ece68e11 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,7 @@ "private": true, "type": "module", "workspaces": [ - "deploy/common", - "deploy/server", - "deploy/worker" + "deploy/profiles/*" ], "scripts": { "ci-test": "concurrently --kill-others \"npm start\" \"wait-on http://localhost:8080 && mocha\"",