docker 升级 2.5.15

steedos · Oct 12, 2023 · 72ddf40 · 72ddf40
1 parent 69e63a6
commit 72ddf40
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 208 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-**/.env
+**/.env
+
+steedos-storage
diff --git a/steedos-community/2.5/Dockerfile b/steedos-community/2.5/Dockerfile
diff --git a/steedos-community/2.5/build.sh b/steedos-community/2.5/build.sh
diff --git a/steedos-community/2.5/package.json b/steedos-community/2.5/package.json
diff --git a/steedos-community/2.5/steedos.config.js b/steedos-community/2.5/steedos.config.js
diff --git a/steedos-community/2.6/Dockerfile b/steedos-community/2.6/Dockerfile
diff --git a/steedos-community/2.6/build.sh b/steedos-community/2.6/build.sh
diff --git a/steedos-community/2.6/package.json b/steedos-community/2.6/package.json
diff --git a/steedos-community/2.6/steedos.config.js b/steedos-community/2.6/steedos.config.js
diff --git a/steedos-community/docker-compose.yml b/steedos-community/docker-compose.yml
@@ -11,12 +11,13 @@ services:
       - PORT=3000
       - MONGO_URL=mongodb://mongodb:27017/steedos
       - MONGO_OPLOG_URL=mongodb://mongodb:27017/local
-      - TRANSPORTER=nats://nats:4222
-      - CACHER=redis://redis:6379
-      - STEEDOS_INITIAL_PACKAGES=@steedos-labs/project-ee,@steedos-labs/demo-ee,@steedos-labs/flows
+      - TRANSPORTER=redis://redis:6379
+      - CACHER=redis://redis:6379/1
+      - STEEDOS_INITIAL_PACKAGES=@steedos-labs/contract-ce
+      - STEEDOS_STORAGE_DIR=/steedos-storage
     volumes:
       - "steedos-installed-packages:/app/.steedos"
-      - "steedos-data:/app/storage"
+      - "steedos-data:/steedos-storage"
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
     healthcheck:
@@ -59,13 +60,6 @@ services:
     command: >
       mongo --host mongodb:27017 --eval "rs.initiate({ _id: 'steedos', members: [{_id: 0, host: 'mongodb:27017'}]})"
 
-  # Micro Service Transporter
-  nats:
-    image: nats:2.9
-    ports:
-      - "4222:4222"
-      # - "8222:8222" # monitor port
-
 
   # watchtower:
   #   restart: always

diff --git a/steedos-enterprise/2.5/Dockerfile b/steedos-enterprise/2.5/Dockerfile
diff --git a/steedos-enterprise/2.5/build.sh b/steedos-enterprise/2.5/build.sh
diff --git a/steedos-enterprise/2.5/package.json b/steedos-enterprise/2.5/package.json
diff --git a/steedos-enterprise/2.5/steedos.config.js b/steedos-enterprise/2.5/steedos.config.js
diff --git a/steedos-enterprise/docker-compose-cluster.yml b/steedos-enterprise/docker-compose-cluster.yml
@@ -5,7 +5,6 @@ services:
   # Steedos Platform  
   steedos:
     image: steedos/steedos-enterprise:2.5
-    command: "yarn start"
     ports:
       - "${STEEDOS_PORT}:3000"
     volumes:

diff --git a/steedos-enterprise/docker-compose.yml b/steedos-enterprise/docker-compose.yml
@@ -5,11 +5,11 @@ services:
   # Steedos Platform  
   steedos:
     image: steedos/steedos-enterprise:2.5
-    command: "yarn start"
     ports:
       - "${STEEDOS_PORT:-3000}:3000"
     volumes:
       - "steedos-packages:/app/.steedos"
+      - "steedos-storage:/steedos-storage"
     environment:
       - ROOT_URL=${STEEDOS_ROOT_URL:-http://localhost:3000} 
       - MONGO_URL=mongodb://root:${MONGODB_PASSWORD:-steedos}@${MONGODB_ADVERTISED_HOSTNAME:-mongodb}:${MONGODB_INITIAL_PRIMARY_PORT_NUMBER:-27017}/${MONGODB_DATABASE:-steedos}?authSource=admin
@@ -21,8 +21,8 @@ services:
       - STEEDOS_CFS_AWS_S3_BUCKET=${MINIO_DEFAULT_BUCKETS:-steedos}
       - STEEDOS_CFS_AWS_S3_ACCESS_KEY_ID=${MINIO_ROOT_USER:-steedos} 
       - STEEDOS_CFS_AWS_S3_SECRET_ACCESS_KEY=${MINIO_ROOT_PASSWORD:-steedos123}
-      - TRANSPORTER=nats://${NATS_USERNAME:-steedos}:${NATS_USERNAME:-steedos}@nats:4222
-      - CACHER=redis://:${REDIS_PASSWORD:-steedos}@redis:6379
+      - TRANSPORTER=redis://:${REDIS_PASSWORD:-steedos}@redis:6379
+      - CACHER=redis://:${REDIS_PASSWORD:-steedos}@redis:6379/1
       - STEEDOS_IDENTITY_OIDC_ENABLED=true
       - STEEDOS_IDENTITY_OIDC_CONFIG_URL=https://id.steedos.cn/realms/master/.well-known/openid-configuration
       - STEEDOS_IDENTITY_OIDC_CLIENT_ID=steedos-oidc-public
@@ -41,8 +41,6 @@ services:
         condition: service_healthy
       minio:
         condition: service_started
-      nats:
-        condition: service_started
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
 
@@ -55,17 +53,6 @@ services:
     ports:
       - "6379:6379"
 
-  # Micro Service Transporter
-  nats:
-    image: steedos/nats:2.8.5
-    environment:
-      - MAX_PAYLOAD=8096000 #8MB
-      - NATS_USERNAME=${NATS_USERNAME:-steedos}
-      - NATS_PASSWORD=${NATS_PASSWORD:-steedos}
-    ports:
-      - "4222:4222"
-      - "8222:8222" # monitor port
-
   # S3 Storage Service
   minio:
     image: bitnami/minio
@@ -145,6 +132,8 @@ services:
 volumes:
   steedos-packages:
     driver: local
+  steedos-storage:
+    driver: local
   steedos-minio-data:
     driver: local
   steedos-mongodb-data: