From a26dfc7baef9e90891760276c81fc847d270e4ba Mon Sep 17 00:00:00 2001
From: cnphpbb <moqiruyi@gmail.com>
Date: Thu, 1 Aug 2024 16:40:58 +0800
Subject: [PATCH] feat(upload): modify memos & gitea version

---
 gitea/env.cfg           |  2 +-
 hub-registry/env.cnf    |  2 ++
 hub-registry/stack.yaml | 20 ++++++++++++++++++++
 memos/env.cfg           |  2 +-
 memos/prod.stack.yml    |  1 +
 webout/env.cfg          |  1 +
 webout/webout.yaml      | 33 +++++++++++++++++++++++++++++++++
 7 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 hub-registry/env.cnf
 create mode 100644 hub-registry/stack.yaml
 create mode 100644 webout/env.cfg
 create mode 100644 webout/webout.yaml

diff --git a/gitea/env.cfg b/gitea/env.cfg
index 61d5cc3..5a02a38 100644
--- a/gitea/env.cfg
+++ b/gitea/env.cfg
@@ -1,2 +1,2 @@
-IMAGE_TAG=gitea/gitea:1.22.0-rootless
+IMAGE_TAG=gitea/gitea:1.22.1-rootless
 Volumes_PATH=/data/volumes/gitea
\ No newline at end of file
diff --git a/hub-registry/env.cnf b/hub-registry/env.cnf
new file mode 100644
index 0000000..f6126a4
--- /dev/null
+++ b/hub-registry/env.cnf
@@ -0,0 +1,2 @@
+IMAGE_TAG=hub.tp229.com:3500/registry:2.7
+UI_IMAGE_TAG=hub.tp229.com:3500/cnphpbb/registry-ui:latest
\ No newline at end of file
diff --git a/hub-registry/stack.yaml b/hub-registry/stack.yaml
new file mode 100644
index 0000000..cfa420b
--- /dev/null
+++ b/hub-registry/stack.yaml
@@ -0,0 +1,20 @@
+# run:: docker compose -p hub-registry --env-file ./hub-registry/env.cfg -f ./hub-registry/stack.yaml up -d
+
+services:
+  registry:
+    image: ${IMAGE_TAG}
+    volumes:
+      - data:/var/lib/registry
+    ports:
+      - '3500:3500'
+    container_name: hub-registry
+    restart: unless-stopped
+
+  registy-ui:
+    image: ${UI_IMAGE_TAG}
+    container_name: hub-registry-ui
+    environment:
+      - NODE_ENV=production
+      - REGISTRY_DOMAIN=hub.tp229.com:3500
+      - REGISTRY_HOST=192.168.0.7:3500
+      - REGISTRY_STORAGE_DELETE_ENABLED=true
diff --git a/memos/env.cfg b/memos/env.cfg
index afc38e7..06d3d3d 100644
--- a/memos/env.cfg
+++ b/memos/env.cfg
@@ -1,4 +1,4 @@
-IMAGE_TAG=neosmemo/memos:0.22.2
+IMAGE_TAG=neosmemo/memos:0.22.4
 Volumes_Path=/data/volumes/memos
 DB_DRIVER=postgres
 DB_USER=postgres
diff --git a/memos/prod.stack.yml b/memos/prod.stack.yml
index eb65618..606365b 100644
--- a/memos/prod.stack.yml
+++ b/memos/prod.stack.yml
@@ -9,6 +9,7 @@ services:
     ports:
       - '5230:5230'
     container_name: memos
+    restart: always
     environment:
       - MEMOS_DRIVER=${DB_DRIVER}
       - MEMOS_DSN=user=${DB_USER} password=${DB_PASSWORD} dbname=${DB_DATANAME} host=${DB_HOST} port=${DB_POST}  sslmode=disable
diff --git a/webout/env.cfg b/webout/env.cfg
new file mode 100644
index 0000000..6ff57fa
--- /dev/null
+++ b/webout/env.cfg
@@ -0,0 +1 @@
+IMAGE_TAG=hub.tp229.com:3500/caddy:2.8.4
diff --git a/webout/webout.yaml b/webout/webout.yaml
new file mode 100644
index 0000000..78c0848
--- /dev/null
+++ b/webout/webout.yaml
@@ -0,0 +1,33 @@
+# run:: docker compose -p out-caddy --env-file ./webout/env.cfg -f ./webout/webout.yaml up -d
+
+services:
+  web-out:
+    image: ${IMAGE_TAG}
+    volumes:
+      - caddy_data:/data
+      - caddy_config:/config
+      - /data/configs/caddy/web-http.conf:/etc/caddy/Caddyfile
+    ports:
+      - '443:443'
+      - '80:80'
+    container_name: web-out
+    restart: unless-stopped
+    environment:
+      - TZ=Asia/Shanghai
+
+  tp229-out:
+    image: ${IMAGE_TAG}
+    volumes:
+      - caddy_data:/data
+      - caddy_config:/config
+      - /data/configs/caddy/site-tp229.conf:/etc/caddy/Caddyfile
+      - /data/www-root:/www-root
+      - /data/soft:/var/www/soft
+    container_name: tp229-out
+    restart: unless-stopped
+    environment:
+      - TZ=Asia/Shanghai
+
+volumes:
+  caddy_data:
+  caddy_config:
\ No newline at end of file