Merge branch 'main' into main

IceWhaleTech · Oct 20, 2023 · ffed2d1 · ffed2d1
2 parents 6f7a4e4 + 774b93f
commit ffed2d1
Show file tree

Hide file tree

Showing 65 changed files with 779 additions and 383 deletions.
diff --git a/.github/workflows/check_yaml_name.yml b/.github/workflows/check_yaml_name.yml
@@ -12,23 +12,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Find YAML files
-        id: find_yaml
-        run: |
-          yaml_files=$(find . -name "*.yaml" -o -name "*.yml" | tr '\n' ' ')
-          echo "::set-output name=yaml_files::$yaml_files"
-
       - name: Check name field in YAML files
         id: check_name
         run: |
-          result=$(grep -oP '^name:\s(?!.*[A-Z])[a-z0-9_-]*$' ${{ steps.find_yaml.outputs.yaml_files }})
-          echo "::set-output name=result::$result"
 
-      - name: Check result
-        run: |
-          if [ -z "${{ steps.check_name.outputs.result }}" ]; then
-            echo "There is a problem with the value of name in the submitted yaml, please make sure the value is in the range [a-z0-9_-]."
-            exit 1
-          else
-            echo "name：${{ steps.check_name.outputs.result }}"
-          fi
+          find . -type f \( -name "docker-compose.yaml" -or -name "docker-compose.yml" \) | while read -r file; do
+            if ! grep -qP '^name:\s[a-z0-9_-]*$' "$file"; then
+              echo "There is a problem with the value of name in the submitted yaml, please make sure the value is in the range [a-z0-9_-]. And error file name：$file"
+              exit 1
+            fi
+          done
diff --git a/.github/workflows/push_to_new_AppStore.yml b/.github/workflows/push_to_new_AppStore.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: remove all file except icon.png
-        run: find . -type f -not \( -name 'icon.png' -or -name '*.json' -or -name '*.yml' \) -delete
+        run: find . -type f -not \( -name '*.yml' \) -delete
       - name: Pushes to another repository
         uses: cpina/github-action-push-to-another-repository@main
         env:
@@ -34,4 +34,8 @@ jobs:
           email: [email protected]
           src_branch: main
           dst_branch: main
+      - name: Error Handling
+        if: ${{ failure() }}
+        run: |
+          curl -X POST -H "Content-Type: application/json" -d '{"msg_type":"text","content":{"text":"CasaOS-AppStore build and publish error"}}' ${{ secrets.APPSTORE_ROBOT_URL }} 
 
diff --git a/Apps/Calibre-web/docker-compose.yml b/Apps/Calibre-web/docker-compose.yml
@@ -93,7 +93,7 @@ x-casaos:
     pt_br: Aplicativo da web para navegar, ler e baixar eBooks armazenados em um banco de dados Calibre
     sv_se: Webbapplikation för att bläddra, läsa och ladda ner e-böcker som lagras i en Calibre-databas
     uk_ua: Веб-застосунок для перегляду, читання та завантаження електронних книг, що зберігаються в базі даних Calibre
-  thumbnail: ' https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/Calibre-web/thumbnail.png'
+  thumbnail: https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/Calibre-web/thumbnail.png
   tips:
     before_install:
       en_us: |

diff --git a/Apps/Cloudflared/docker-compose.yml b/Apps/Cloudflared/docker-compose.yml
@@ -1,7 +1,7 @@
 name: cloudflared
 services:
   cloudflared:
-    image: wisdomsky/casaos-cloudflared:1.0
+    image: wisdomsky/cloudflared-web:2023.8.2
     restart: unless-stopped
     network_mode: host
     x-casaos:

diff --git a/Apps/Crafty/appfile.json b/Apps/Crafty/appfile.json
@@ -0,0 +1,226 @@
+{
+    "version": "1.0",
+    "title": "Crafty",
+    "name": "crafty",
+    "icon": "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/Crafty/icon.png",
+    "tagline": "Take control of your Minecraft servers.",
+    "overview": "Crafty is an open source Minecraft control panel built using Tornado and AdminLTE, featuring server scheduling, a interactive console and the ability to run almost any type of Minecraft server",
+    "thumbnail": "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/Crafty/thumbnail.jpg",
+    "screenshots": [
+        "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/Crafty/screenshot-1.png",
+        "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/Crafty/screenshot-2.png",
+        "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/Crafty/screenshot-3.png",
+        "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/Crafty/screenshot-4.png",
+        "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/Crafty/screenshot-5.png",
+        "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/Crafty/screenshot-6.png",
+        "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/Crafty/screenshot-7.png"
+    ],
+    "category": [
+        "Games"
+    ],
+    "developer": {
+        "name": "Crafty Team",
+        "website": "https://gitlab.com/crafty-controller/crafty-team",
+        "donate_text": "", 
+        "donate_link": ""
+    },
+    "adaptor": {
+        "name": "Chàra Rose",
+        "website": "https://chara.cloud",
+        "donate_text": "", 
+        "donate_link": ""
+    },
+    "support": "https://discord.gg/knqAbbBbeX",
+    "website": "https://www.casaos.io",
+    "container": {
+        "image": "arcadiatechnology/crafty-4",
+        "shell": "bash",
+        "privileged": false,
+        "network_model": "bridge",
+        "web_ui": {
+            "http": "8110",
+            "path": "/panel"
+        },
+        "envs": [
+            {
+                "key": "TZ",
+                "value": "Etc/UTC",
+                "configurable": "yes",
+                "description": "Timezone"
+            }
+        ],
+        "ports": [
+            {
+                "container": "8000",
+                "host": "8110",
+                "type": "tcp",
+                "allocation": "preferred",
+                "configurable": "advanced",
+                "description": "WebUI HTTP Port"
+            },
+            {
+                "container": "19132",
+                "host": "19132",
+                "type": "udp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft Bedrock listening Port (UDP)"
+            },
+            {
+                "container": "25565",
+                "host": "25565",
+                "type": "tcp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft listening Port (TCP)"
+            },
+            {
+                "container": "25566",
+                "host": "25566",
+                "type": "tcp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft listening Port (TCP)"
+            },
+            {
+                "container": "25567",
+                "host": "25567",
+                "type": "tcp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft listening Port (TCP)"
+            },
+            {
+                "container": "25568",
+                "host": "25568",
+                "type": "tcp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft listening Port (TCP)"
+            },
+            {
+                "container": "25569",
+                "host": "25569",
+                "type": "tcp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft listening Port (TCP)"
+            },
+            {
+                "container": "25570",
+                "host": "25570",
+                "type": "tcp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft listening Port (TCP)"
+            },
+            {
+                "container": "25565",
+                "host": "25565",
+                "type": "udp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft listening Port (UDP)"
+            },
+            {
+                "container": "25566",
+                "host": "25566",
+                "type": "udp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft listening Port (UDP)"
+            },
+            {
+                "container": "25567",
+                "host": "25567",
+                "type": "udp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft listening Port (UDP)"
+            },
+            {
+                "container": "25568",
+                "host": "25568",
+                "type": "udp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft listening Port (UDP)"
+            },
+            {
+                "container": "25569",
+                "host": "25569",
+                "type": "udp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft listening Port (UDP)"
+            },
+            {
+                "container": "25570",
+                "host": "25570",
+                "type": "udp",
+                "allocation": "required",
+                "configurable": "no",
+                "description": "Minecraft listening Port (UDP)"
+            }
+        ],
+        "volumes": [
+            {
+                "container": "/crafty/backups",
+                "host": "/DATA/AppData/crafty/backups",
+                "mode": "rw",
+                "allocation": "automatic",
+                "configurable": "no",
+                "description": "Crafty backups directory."
+            },
+            {
+                "container": "/crafty/logs",
+                "host": "/DATA/AppData/crafty/logs",
+                "mode": "rw",
+                "allocation": "automatic",
+                "configurable": "no",
+                "description": "Crafty logs directory."
+            },
+            {
+                "container": "/crafty/servers",
+                "host": "/DATA/AppData/crafty/servers",
+                "mode": "rw",
+                "allocation": "automatic",
+                "configurable": "no",
+                "description": "Crafty servers directory."
+            },
+            {
+                "container": "/crafty/app/config",
+                "host": "/DATA/AppData/crafty/config",
+                "mode": "rw",
+                "allocation": "automatic",
+                "configurable": "no",
+                "description": "Crafty config directory."
+            },
+            {
+                "container": "/crafty/import",
+                "host": "/DATA/AppData/crafty/import",
+                "mode": "rw",
+                "allocation": "automatic",
+                "configurable": "no",
+                "description": "Crafty import directory."
+            }
+        ],
+        "devices": [],
+        "constraints": {
+            "min_memory": 1024,
+            "min_storage": 1024
+        },
+        "restart_policy": "unless-stopped",
+        "sysctls": [],
+        "cap_add": [],
+        "labels": []
+    },
+    "abilities": {
+        "notification": false,
+        "widgets": false,
+        "authentication": false,
+        "search": false,
+        "upnp": false
+    },
+    "tips": {}
+}