feat: 应用增加label

apps/halo/versions/1.6.0/docker-compose.yml

@@ -18,7 +18,8 @@ services:
       SPRING_DATASOURCE_PASSWORD: ${PANEL_DB_USER_PASSWORD}
       HALO_ADMIN_PATH: admin
       HALO_CACHE: memory
-
+    labels:
+      createdBy: "apps"
 networks:
   1panel:
     external: true

apps/mysql/versions/5.7.39/docker-compose.yml

@@ -20,7 +20,8 @@ services:
       --collation-server=utf8mb4_general_ci
       --explicit_defaults_for_timestamp=true
       --lower_case_table_names=1
-
+    labels:
+      createdBy: "apps"
 networks:
   1panel:
     external: true

apps/mysql/versions/8.0.30/docker-compose.yml

@@ -15,6 +15,8 @@ services:
       - ./data/:/var/lib/mysql
       - ./conf/my.cnf:/etc/my.cnf
       - ./log:/var/log/mysql
+    labels:
+      createdBy: "apps"
 
 networks:
   1panel:

apps/nginx/versions/1.23.1/docker-compose.yml

@@ -10,3 +10,5 @@ services:
       - ./conf/conf.d:/usr/local/openresty/nginx/conf/conf.d/
       - ./www:/www
       - ./root:/usr/share/nginx/html
+    labels:
+      createdBy: "apps"

apps/phpmyadmin/versions/5.2.0/docker-compose.yml

@@ -9,6 +9,8 @@ services:
       - PMA_HOST=${PANEL_DB_HOST}
     networks:
       - 1panel
+    labels:
+      createdBy: "apps"
 
 networks:
   1panel:

apps/redis-commander/versions/0.8.0/docker-compose.yml

@@ -11,6 +11,8 @@ services:
       - REDIS_HOSTS=1panel:${PANEL_REDIS_HOST}:6379:0:${PANEL_DB_ROOT_PASSWORD}
     ports:
       - ${PANEL_APP_PORT_HTTP}:8081
+    labels:
+      createdBy: "apps"
 networks:
   1panel:
     external: true

apps/redis/versions/6.0.16/docker-compose.yml

@@ -12,6 +12,9 @@ services:
       - ./data:/data
       - ./conf/redis.conf:/etc/redis/redis.conf
       - ./logs:/logs
+    labels:
+      createdBy: "apps"
+
 networks:
   1panel:
     external: true

apps/redis/versions/7.0.5/docker-compose.yml

@@ -12,6 +12,9 @@ services:
       - ./data:/data
       - ./conf/redis.conf:/etc/redis/redis.conf
       - ./logs:/logs
+    labels:
+      createdBy: "apps"
+
 networks:
   1panel:
     external: true

apps/wordpress/versions/6.0.1/docker-compose.yml

@@ -16,6 +16,8 @@ services:
       WORDPRESS_DB_USER: ${PANEL_DB_USER}
       WORDPRESS_DB_PASSWORD: ${PANEL_DB_USER_PASSWORD}
       WORDPRESS_DEBUG: 1
+    labels:
+      createdBy: "apps"
 
 networks:
   1panel:

apps/wordpress/versions/6.0.2/docker-compose.yml

@@ -16,6 +16,8 @@ services:
       WORDPRESS_DB_USER: ${PANEL_DB_USER}
       WORDPRESS_DB_PASSWORD: ${PANEL_DB_USER_PASSWORD}
       WORDPRESS_DEBUG: 1
+    labels:
+      createdBy: "apps"
 
 networks:
   1panel:

backend/app/service/website_utils.go

@@ -81,9 +81,6 @@ func createWebsiteFolder(nginxInstall model.AppInstall, website *model.WebSite)
 		if err := fileOp.CreateFile(path.Join(siteFolder, "log", "access.log")); err != nil {
 			return err
 		}
-		if err := fileOp.CreateDir(path.Join(siteFolder, "waf", "rules"), 0755); err != nil {
-			return err
-		}
 		if err := fileOp.CreateDir(path.Join(siteFolder, "data"), 0755); err != nil {
 			return err
 		}
@@ -91,7 +88,7 @@ func createWebsiteFolder(nginxInstall model.AppInstall, website *model.WebSite)
 			return err
 		}
 	}
-	return fileOp.CopyDir(path.Join(nginxFolder, "www", "common", "waf", "rules"), path.Join(siteFolder, "waf", "rules"))
+	return fileOp.CopyDir(path.Join(nginxFolder, "www", "common", "waf", "rules"), path.Join(siteFolder, "waf"))
 }
 
 func configDefaultNginx(website *model.WebSite, domains []model.WebSiteDomain) error {