Merge branch 'refactor' into localApps

apps/acg-faka/3.2.1/data.yml

@@ -1,12 +1,5 @@
 additionalProperties:
   formFields:
-    - default: "./data"
-      edit: true
-      envKey: ACG_FAKA_ROOT_PATH
-      labelZh: 数据持久化路径
-      labelEn: Data persistence path
-      required: true
-      type: text
     - default: 8080
       edit: true
       envKey: PANEL_APP_PORT_HTTP

apps/acg-faka/3.2.1/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   acg-faka:
-    image: qyg2297248353/acg-faka:v1.3.9
+    image: ghcr.io/pooneyy/acg-faka:3.2.1
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
@@ -13,5 +13,3 @@ services:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:80
-    volumes:
-      - ${ACG_FAKA_ROOT_PATH}:/var/www/html

apps/acg-faka/Dockerfile

@@ -0,0 +1,21 @@
+From php:8.4-apache-bookworm
+ARG REF main
+RUN apt-get update && apt-get install -y \
+      git \
+      libfreetype6-dev \
+      libjpeg-dev \
+      libpng-dev \
+      libwebp-dev \
+      libzip-dev \
+      zlib1g-dev && \
+    docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp && \
+    docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd && \
+    docker-php-ext-configure zip && \
+    docker-php-ext-install gd pdo_mysql zip && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* && \
+    git config --global --add safe.directory /var/www/html && \
+    git clone https://github.com/lizhipay/acg-faka . && \
+    git checkout $REF && \
+    rm -rf .git && \
+    a2enmod rewrite

apps/iframely/2.5.0/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   iframely:
-    image: qyg2297248353/iframely:v2.4.3
+    image: ghcr.io/pooneyy/iframely:2.5.0
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/kotatsu/20250804/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   kotatsu-syncserver:
-    image: qyg2297248353/kotatsu-syncserver:v20250725
+    image: ghcr.io/pooneyy/kotatsu-syncserver:20250804
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/maccms10/2025.1000.4050/data.yml

@@ -1,12 +1,5 @@
 additionalProperties:
   formFields:
-    - default: "./data"
-      edit: true
-      envKey: MACCMS10_ROOT_PATH
-      labelZh: 数据持久化路径
-      labelEn: Data persistence path
-      required: true
-      type: text
     - default: 80
       edit: true
       envKey: PANEL_APP_PORT_HTTP

apps/maccms10/2025.1000.4050/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   maccms10:
-    image: qyg2297248353/maccms10:v24.11.19
+    image: ghcr.io/pooneyy/maccms10:2025.1000.4050
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
@@ -13,5 +13,3 @@ services:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:80
-    volumes:
-      - ${MACCMS10_ROOT_PATH}/www:/var/www

apps/maccms10/Dockerfile

@@ -0,0 +1,15 @@
+From php:8-apache-bookworm
+ARG REF master
+RUN apt-get update && apt-get install -y \
+      git \
+      libzip-dev && \
+    docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd && \
+    docker-php-ext-configure zip && \
+    docker-php-ext-install pdo_mysql zip && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* && \
+    git config --global --add safe.directory /var/www/html && \
+    git clone https://github.com/magicblack/maccms10 . && \
+    git checkout $REF && \
+    rm -rf .git && \
+    chmod -R 777 application runtime upload

apps/mcy-shop/5.0.29/data.yml

@@ -1,12 +1,5 @@
 additionalProperties:
   formFields:
-    - default: "./data"
-      edit: true
-      envKey: MCY_SHOP_ROOT_PATH
-      labelZh: 数据持久化路径
-      labelEn: Data persistence path
-      required: true
-      type: text
     - default: 8080
       edit: true
       envKey: PANEL_APP_PORT_HTTP

apps/mcy-shop/5.0.29/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   mcy-shop:
-    image: qyg2297248353/mcy-shop:v5.0.17
+    image: ghcr.io/pooneyy/mcy-shop:5.0.29
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
@@ -13,5 +13,3 @@ services:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:80
-    volumes:
-      - ${MCY_SHOP_ROOT_PATH}/data:/var/www/html

apps/mcy-shop/Dockerfile

@@ -0,0 +1,21 @@
+From php:8-apache-bookworm
+ARG REF main
+RUN apt-get update && apt-get install -y \
+      git \
+      libfreetype6-dev \
+      libjpeg-dev \
+      libpng-dev \
+      libwebp-dev \
+      libzip-dev && \
+    docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp && \
+    docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd && \
+    docker-php-ext-configure zip && \
+    docker-php-ext-install gd pdo_mysql zip && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* && \
+    git config --global --add safe.directory /var/www/html && \
+    git clone https://github.com/lizhipay/mcy-shop . && \
+    git checkout $REF && \
+    rm -rf .git && \
+    chmod -R 777 ./* && \
+    a2enmod rewrite