[fix] some Deployment detail bugs

Author: TechQuery

.github/workflows/deploy-production.yml

@@ -9,8 +9,8 @@ on:
       - v*
 env:
   ARTIFACT_PATH: /tmp/artifact.tar
-  BOX_NAME: next-bootstrap-ts
-  BOX_URL: idea2app/next-bootstrap-ts
+  BOX_NAME: web-server
+  BOX_URL: idea2app/web-server
 
 jobs:
   deploy_docker_image:

Dockerfile

@@ -10,14 +10,15 @@ COPY . /app
 WORKDIR /app
 
 FROM base AS prod-deps
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm i --prod --frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store  pnpm i -P --frozen-lockfile --ignore-scripts
 
 FROM base AS build
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm i --frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store  pnpm i --frozen-lockfile
 RUN pnpm build
 
 FROM base
-COPY --from=prod-deps /app/node_modules /app/node_modules
-COPY --from=build /app/dist /app/dist
+COPY --from=prod-deps /app/node_modules ./node_modules
+COPY --from=build /app/public ./public
+COPY --from=build /app/.next ./.next
 EXPOSE 3000
 CMD ["npm", "start"]

README.md

@@ -1,4 +1,4 @@
-# Next-Bootstrap.ts
+# idea2app OWS
 
 [React][1] project scaffold based on [TypeScript][2], [Next.js][3], [Bootstrap][4] & [Workbox][5]. And this project bootstrapped with [`create-next-app`][6].
 

docker-compose.yml

@@ -4,13 +4,8 @@ networks:
   idea2app:
 
 services:
-  next-bootstrap-ts:
-    image: idea2app/next-bootstrap-ts
-    environment:
-      - NODE_ENV=production
-      - PORT=3000
-    ports:
-      - 3000:3000
+  web-server:
+    image: idea2app/web-server
     networks:
       - idea2app
     healthcheck:
@@ -34,11 +29,11 @@ services:
 
   caddy:
     depends_on:
-      - next-bootstrap-ts
+      - web-server
     image: caddy
     ports:
       - 80:80
       - 443:443
     networks:
       - idea2app
-    command: caddy reverse-proxy --from your.domain.com --to next-bootstrap-ts:3000
+    command: caddy reverse-proxy --from idea2app.cn --to web-server:3000

next.config.js renamed to next.config.mjs

@@ -1,6 +1,6 @@
-const { NormalModuleReplacementPlugin } = require('webpack'),
-  withLess = require('next-with-less'),
-  setPWA = require('next-pwa');
+import webpack from 'webpack';
+import withLess from 'next-with-less';
+import setPWA from 'next-pwa';
 
 const { NODE_ENV } = process.env,
   withPWA = setPWA({
@@ -13,11 +13,11 @@ const { NODE_ENV } = process.env,
 /**
  * @type {import('next').NextConfig}
  */
-module.exports = withPWA(
+export default withPWA(
   withLess({
     webpack: config => {
       config.plugins.push(
-        new NormalModuleReplacementPlugin(/^node:/, resource => {
+        new webpack.NormalModuleReplacementPlugin(/^node:/, resource => {
           resource.request = resource.request.replace(/^node:/, '');
         }),
       );

package.json

@@ -8,6 +8,8 @@
     "file-type": "^18.7.0",
     "idea-react": "^1.0.0-rc.30",
     "koajax": "^0.9.6",
+    "less": "^4.2.0",
+    "less-loader": "^11.1.3",
     "lodash": "^4.17.21",
     "mobx": "~6.10.2",
     "mobx-i18n": "^0.4.2",
@@ -16,30 +18,27 @@
     "mobx-restful": "^0.6.12",
     "mobx-restful-table": "^1.2.2",
     "next": "^14.0.3",
+    "next-pwa": "~5.6.0",
     "next-ssr-middleware": "^0.6.1",
+    "next-with-less": "^3.0.1",
     "react": "^18.2.0",
     "react-bootstrap": "^2.9.1",
     "react-dom": "^18.2.0",
     "web-utility": "^4.1.3",
     "webpack": "^5.89.0"
   },
   "devDependencies": {
-    "@octokit/openapi-types": "^19.0.2",
+    "@octokit/openapi-types": "^19.1.0",
     "@types/lodash": "^4.14.202",
-    "@types/node": "^18.18.13",
-    "@types/react": "^18.2.38",
+    "@types/node": "^18.19.0",
+    "@types/react": "^18.2.39",
     "eslint": "^8.54.0",
     "eslint-config-next": "^14.0.3",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "husky": "^8.0.3",
-    "less": "^4.2.0",
-    "less-loader": "^11.1.3",
     "lint-staged": "^15.1.0",
-    "next-pwa": "~5.6.0",
-    "next-with-less": "^3.0.1",
     "prettier": "^3.1.0",
-    "ts-node": "^10.9.1",
     "typescript": "~5.3.2"
   },
   "prettier": {
@@ -59,7 +58,7 @@
     "start": "next start",
     "lint": "next lint",
     "test": "lint-staged  &&  npm run lint",
-    "pack-image": "docker build -t idea2app/next-bootstrap-ts:latest .",
-    "container": "docker rm -f next-bootstrap-ts  &&  docker run --name next-bootstrap-ts -p 3000:3000 -d idea2app/next-bootstrap-ts:latest"
+    "pack-image": "docker build -t idea2app/web-server .",
+    "container": "docker rm -f web-server  &&  docker run --name web-server -p 3000:3000 -d idea2app/web-server"
   }
 }