fix: k8s startup time; add extra pkg in app-service; fix deploy scripts

labring · Sep 12, 2022 · 679d2b4 · 679d2b4
1 parent 6519c95
commit 679d2b4
Show file tree

Hide file tree

Showing 7 changed files with 11,126 additions and 3,666 deletions.
diff --git a/deploy/docker-compose/docker-compose.yml b/deploy/docker-compose/docker-compose.yml
@@ -21,16 +21,13 @@ services:
       - laf_shared_network
 
   oss:
-    image: 'bitnami/minio:2022.8.11'
+    image: 'minio/minio:RELEASE.2022-08-13T21-54-44Z'
     environment:
       - MINIO_ROOT_USER=${MINIO_ROOT_USER}
       - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD}
-      - MINIO_DISTRIBUTED_MODE_ENABLED=yes
-      - MINIO_DISTRIBUTED_NODES=oss/data/{0...3}
-      - MINIO_ETCD_ENDPOINTS=http://etcd:2379
-      - MINIO_SKIP_CLIENT=yes
       - MINIO_REGION_NAME=cn-default
       - MINIO_DOMAIN=${OSS_DOMAIN}
+    command: ["minio", "server", "/data/{0...3}", "--console-address", ":9001"]
     ports:
       - "9020:9000"
       - "9120:9001"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -35,15 +35,13 @@ services:
       - laf_shared_network
 
   oss:
-    image: 'bitnami/minio:2022.8.11'
+    image: 'minio/minio:RELEASE.2022-08-13T21-54-44Z'
     environment:
       - MINIO_ROOT_USER=minio-root-user
       - MINIO_ROOT_PASSWORD=minio-root-password
-      - MINIO_DISTRIBUTED_MODE_ENABLED=yes
-      - MINIO_DISTRIBUTED_NODES=oss/data/{0...3}
-      - MINIO_SKIP_CLIENT=yes
       - MINIO_REGION_NAME=cn-default
       - MINIO_DOMAIN=oss.127-0-0-1.nip.io
+    command: ["minio", "server", "/data/{0...3}", "--console-address", ":9001"]
     ports:
       - "9020:9000"
       - "9120:9001"
@@ -104,7 +102,7 @@ services:
       SERVICE_DRIVER: docker
       APP_SERVICE_ENV_NPM_INSTALL_FLAGS: ' --no-audit --no-fund'
       MINIO_INTERNAL_ENDPOINT: http://oss:9000
-      MINIO_EXTERNAL_ENDPOINT: oss.laf.windup.top
+      MINIO_EXTERNAL_ENDPOINT: http://oss.127-0-0-1.nip.io:8080
       PUBLISH_PORT: ${PUBLISH_PORT:-8080}
       PUBLISH_HTTPS_PORT: ${PUBLISH_HTTPS_PORT:-9443}
       MINIO_REGION_NAME: cn-default