chore: adjust Dockerfiles

Author: openscript

.github/workflows/cd-registries.yaml

@@ -53,5 +53,5 @@ jobs:
         uses: nrwl/nx-set-shas@v3
 
       - name: 'Build images'
-        run: INPUT_GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} npx nx affected --base=$NX_BASE --head=$NX_HEAD --target=container --parallel=2
+        run: INPUT_GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} pnpm nx affected --base=$NX_BASE --head=$NX_HEAD --target=container --parallel=2
 

README.md

@@ -30,5 +30,3 @@ All parts of the project live inside this monorepo.
   - [`mockup`](./apps/mockup/)
 - Libs
   - [`ui`](./libs/ui/): Common UI components are represented inside this package.
-
-Projects need be configured to output into the workspace `dist` folder.

apps/backend/Dockerfile

@@ -3,7 +3,7 @@ FROM docker.io/node:lts-alpine AS deps
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat
 WORKDIR /usr/src/app
-COPY dist/apps/backend/package*.json ./
+COPY package*.json ./
 RUN npm install --omit=dev
 
 # Production image, copy all the files and run nest
@@ -14,7 +14,7 @@ ENV PORT=3000
 WORKDIR /usr/src/app
 COPY --from=deps /usr/src/app/node_modules ./node_modules
 COPY --from=deps /usr/src/app/package.json ./package.json
-COPY dist/apps/backend .
+COPY dist/* .
 RUN chown -R node:node .
 USER node
 EXPOSE 3000

apps/backend/tsconfig.build.json

@@ -1,7 +1,4 @@
 {
   "extends": "./tsconfig.json",
-  "exclude": ["node_modules", "test", "dist", "**/*spec.ts"],
-  "compilerOptions": {
-    "outDir": "../../dist/apps/backend"
-  }
+  "exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
 }

apps/frontend/Dockerfile

@@ -1,4 +1,4 @@
 FROM docker.io/nginx:stable-alpine
-COPY dist/apps/frontend/* /usr/share/nginx/html/
+COPY dist/* /usr/share/nginx/html/
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

apps/frontend/vite.config.ts

@@ -6,9 +6,6 @@ export default defineConfig({
   server: {
     port: 3001
   },
-  build: {
-    outDir: "../../dist/apps/frontend",
-  },
   clearScreen: false,
   plugins: [react()],
 })

nx.json

@@ -9,7 +9,7 @@
     "build": {
       "dependsOn": ["^build"],
       "cache": true,
-      "outputs": ["{workspaceRoot}/dist/{projectName}"]
+      "outputs": ["{projectRoot}/dist"]
     },
     "dev": {
       "dependsOn": ["^build"]