From d2520093567393fcca44964fd2a692ad48cb0f1e Mon Sep 17 00:00:00 2001
From: oscarz <oscar@vip.qq.com>
Date: Mon, 19 May 2025 16:04:32 +0800
Subject: [PATCH] modify scripts

---
 docker/instock/docker-compose.yml | 36 +++++++++++++++++++++++++++++++
 docker/stash/Dockerfile           |  5 +++--
 docker/stash/docker-compose.yml   |  8 ++++---
 3 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 docker/instock/docker-compose.yml

diff --git a/docker/instock/docker-compose.yml b/docker/instock/docker-compose.yml
new file mode 100644
index 0000000..831de88
--- /dev/null
+++ b/docker/instock/docker-compose.yml
@@ -0,0 +1,36 @@
+version: "3.8"
+
+services:
+  instock:
+    image: mayanghua/instock:latest
+    container_name: InStock
+    platform: linux/amd64  # 指定运行的是 x86 架构
+    restart: unless-stopped
+    ports:
+      - "9988:9988"
+    environment:
+      TZ: Asia/Shanghai  # 设置时区为北京时间
+      db_host: testdb
+      db_user: root
+      db_password: mysqlpw
+      db_database: instockdb
+      db_port: 3306
+
+    #volumes:
+      # 存储所有数据（搜索索引、SQLite 数据库、分类模型等）的地方
+      #- ~/dockers/paperless/data:/usr/src/paperless/data
+      # 挂载文件导入目录
+      #- ~/dockers/paperless/consume:/usr/src/paperless/consume
+      # 挂载文件导出目录
+      #- ~/dockers/paperless/export:/usr/src/paperless/export
+      # 存储您的文档和缩略图的地方
+      #- ~/dockers/paperless/media:/usr/src/paperless/media
+      # 挂载脚本，比如 PAPERLESS_POST_CONSUME_SCRIPT
+      #- ~/dockers/paperless/scripts:/usr/src/paperless/scripts
+
+    networks:
+      - devops  
+
+networks:
+  devops:
+    external: true
\ No newline at end of file
diff --git a/docker/stash/Dockerfile b/docker/stash/Dockerfile
index ef87ce5..e051cec 100644
--- a/docker/stash/Dockerfile
+++ b/docker/stash/Dockerfile
@@ -35,5 +35,6 @@ RUN git config --global user.name "oscar" && \
 # COPY FutuOpenD.tar.gz /root/
 # RUN tar -xzf /root/FutuOpenD.tar.gz -C /root/ && rm /root/FutuOpenD.tar.gz
 
-# 启动时进入 bash 交互模式
-CMD ["/bin/bash"]
\ No newline at end of file
+# 使用 ENTRYPOINT 启动 Stash
+ENTRYPOINT ["stash"]
+#CMD ["start"]  # 或其他启动参数
\ No newline at end of file
diff --git a/docker/stash/docker-compose.yml b/docker/stash/docker-compose.yml
index ebebe2a..40c92d1 100644
--- a/docker/stash/docker-compose.yml
+++ b/docker/stash/docker-compose.yml
@@ -5,11 +5,11 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: newstash
+    container_name: stash
     platform: linux/x86_64
     restart: unless-stopped
     ports:
-      - "8888:9999"
+      - "9999:9999"    # 宿主机端口:容器端口
     environment:
       HTTP_PROXY: "http://192.168.2.20:7890"
       HTTPS_PROXY: "http://192.168.2.20:7890"
@@ -42,7 +42,9 @@ services:
       - ~/dockers/stash/.gitconfig:/root/.gitconfig  # 共享 Git 配置文件
     networks:
       - devops
-
+    #command: tail -f /dev/null  # 保持容器运行，调试使用
+    #stdin_open: true
+    #tty: true
 networks:
   devops:
     external: true
\ No newline at end of file