fix: optimize docker up

README.md

@@ -68,9 +68,6 @@ pnpm run build --app main
 5. Start by docker:
 
 ```shell
-# build image
-pnpm run docker:build
-
 # start
 pnpm run docker:up
 ```

docker-compose.yml

@@ -1,8 +1,10 @@
 version: '3.8'
 
 services:
-    nginx:
-        image: micro-frontend-starter:latest
+    micro-fe:
+        build:
+            context: .
+            dockerfile: ./Dockerfile
         container_name: micro-frontend-starter
         restart: always
         ports:

docker/conf.d/main.conf

@@ -1,12 +1,12 @@
 server {
-  listen 8000;
-  server_name localhost;
+    listen 8000;
+    server_name localhost;
 
-  add_header Access-Control-Allow-Origin *;
-  root /opt/www/main/;
-  index index.html index.htm;
+    add_header Access-Control-Allow-Origin *;
+    root /opt/www/main/;
+    index index.html index.htm;
 
-  location / {
-    try_files $uri $uri/ /index.html;
-  }
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
 }

docker/conf.d/subapp1.conf

@@ -1,13 +1,13 @@
 server {
-  listen 8001;
-  server_name localhost;
+    listen 8001;
+    server_name localhost;
 
-  #charset koi8-r;
-  #access_log  /var/log/nginx/log/host.access.log  main;
+    #charset koi8-r;
+    #access_log  /var/log/nginx/log/host.access.log  main;
 
-  location / {
-    add_header Access-Control-Allow-Origin *;
-    root /opt/www/subapp1/;
-    index index.html index.htm;
-  }
+    location / {
+        add_header Access-Control-Allow-Origin *;
+        root /opt/www/subapp1/;
+        index index.html index.htm;
+    }
 }

docker/conf.d/subapp2.conf

@@ -1,13 +1,13 @@
 server {
-  listen 8002;
-  server_name localhost;
+    listen 8002;
+    server_name localhost;
 
-  #charset koi8-r;
-  #access_log  /var/log/nginx/log/host.access.log  main;
+    #charset koi8-r;
+    #access_log  /var/log/nginx/log/host.access.log  main;
 
-  location / {
-    add_header Access-Control-Allow-Origin *;
-    root /opt/www/subapp2/;
-    index index.html index.htm;
-  }
+    location / {
+        add_header Access-Control-Allow-Origin *;
+        root /opt/www/subapp2/;
+        index index.html index.htm;
+    }
 }

docker/conf.d/subapp3.conf

@@ -1,13 +1,13 @@
 server {
-  listen 8003;
-  server_name localhost;
+    listen 8003;
+    server_name localhost;
 
-  #charset koi8-r;
-  #access_log  /var/log/nginx/log/host.access.log  main;
+    #charset koi8-r;
+    #access_log  /var/log/nginx/log/host.access.log  main;
 
-  location / {
-    add_header Access-Control-Allow-Origin *;
-    root /opt/www/subapp3/;
-    index index.html index.htm;
-  }
+    location / {
+        add_header Access-Control-Allow-Origin *;
+        root /opt/www/subapp3/;
+        index index.html index.htm;
+    }
 }

docker/nginx.conf

@@ -6,26 +6,26 @@ pid /var/run/nginx.pid;
 
 
 events {
-  worker_connections 1024;
+    worker_connections 1024;
 }
 
 
 http {
-  include /etc/nginx/mime.types;
-  default_type application/octet-stream;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
 
-  log_format main '$remote_addr - $remote_user [$time_local] "$request" '
-  '$status $body_bytes_sent "$http_referer" '
-  '"$http_user_agent" "$http_x_forwarded_for"';
+    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+    '$status $body_bytes_sent "$http_referer" '
+    '"$http_user_agent" "$http_x_forwarded_for"';
 
-  access_log /var/log/nginx/access.log main;
+    access_log /var/log/nginx/access.log main;
 
-  sendfile on;
-  #tcp_nopush     on;
+    sendfile on;
+    #tcp_nopush     on;
 
-  keepalive_timeout 65;
+    keepalive_timeout 65;
 
-  #gzip  on;
+    #gzip  on;
 
-  include /etc/nginx/conf.d/*.conf;
+    include /etc/nginx/conf.d/*.conf;
 }

packages/subapp1/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "dev": "vite",
-    "build": "vue-tsc --noEmit && vite build",
+    "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {

packages/subapp4/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "dev": "vite",
-    "build": "vue-tsc --noEmit && vite build",
+    "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {

scripts/build.ts

@@ -26,7 +26,7 @@ async function build(appName: string) {
         step(`[${appName}] Building`);
         const runArgs = ['run', 'build'];
         const cwd = join(rootDir, appName);
-        await runCommand('pnpm', runArgs, join(rootDir, appName));
+        await runCommand('pnpm', runArgs, cwd);
         // copy dist to deploy dist dir
         copyDist(`${cwd}/dist`, `${deployDist}/${appName}`);
     } catch (e) {