Merge branch 'refactor' into localApps

apps/docker-lxc/data.yml

@@ -1,20 +1,20 @@
-name: docker-lxc
+name: docker-lxc
-tags:
+tags:
-    - 工具
+    - 工具
-title: 运行由 docker 管理的有状态 lxc 容器
+title: 运行由 docker 管理的有状态 lxc 容器
-type: 工具
+type: 工具
-description: 运行由 docker 管理的有状态 lxc 容器
+description: 运行由 docker 管理的有状态 lxc 容器
-additionalProperties:
+additionalProperties:
-    key: docker-lxc
+    key: docker-lxc
-    name: docker-lxc
+    name: docker-lxc
-    tags:
+    tags:
-        - Tool
+        - Tool
-    shortDescZh: 运行由 docker 管理的有状态 lxc 容器
+    shortDescZh: 运行由 docker 管理的有状态 lxc 容器
-    shortDescEn: Run stateful lxc containers managed by docker
+    shortDescEn: Run stateful lxc containers managed by docker
-    type: tool
+    type: tool
-    crossVersionUpdate: true
+    crossVersionUpdate: true
-    limit: 0
+    limit: 0
-    recommend: 0
+    recommend: 0
-    website: https://hub.docker.com/r/micwy/lxc
+    website: https://hub.docker.com/r/micwy/lxc
-    github: https://github.com/micw/docker-lxc
+    github: https://github.com/micw/docker-lxc
-    document: https://github.com/micw/docker-lxc
+    document: https://github.com/micw/docker-lxc

apps/meowfacts/latest/docker-compose.yml

@@ -1,10 +1,6 @@
 services:
   meowfacts:
-    build:
+    image: ghcr.io/pooneyy/meowfacts:latest
-      context: .
-      dockerfile: Dockerfile
-      args:
-        IMAGE_TAG: latest
     container_name: ${CONTAINER_NAME}
     restart: always
     networks:

apps/php-unofficial/7.4.33-alpine/docker-compose.yml

@@ -1,8 +1,6 @@
 services:
   php74a:
-    build:
+    image: ghcr.io/pooneyy/php:7.4.33-fpm-alpine-php-unofficial
-      context: .
-      dockerfile: Dockerfile
     container_name: ${CONTAINER_NAME}
     restart: always
     networks:

apps/php-unofficial/7.4.33/docker-compose.yml

@@ -1,8 +1,6 @@
 services:
   php74:
-    build:
+    image: ghcr.io/pooneyy/php:7.4.33-fpm-php-unofficial
-      context: .
-      dockerfile: Dockerfile
     container_name: ${CONTAINER_NAME}
     restart: always
     networks:

apps/php-unofficial/8.1.33/Dockerfile

@@ -1,6 +1,6 @@
 #Reference Links ：https://github.com/docker-library/php/issues/926#issuecomment-567230723
 
-FROM php:8.1.33-fpm
+FROM php:8.1.33-fpm-bookworm
 
 ARG UNAME=www-data
 ARG UGROUP=www-data
@@ -91,5 +91,3 @@ RUN docker-php-ext-enable imagick
 RUN echo "extension=redis.so" >> /usr/local/etc/php/php.ini
 
 WORKDIR /www
-
-

apps/php-unofficial/8.1.33/docker-compose.yml

@@ -1,8 +1,6 @@
 services:
   php81:
-    build:
+    image: ghcr.io/pooneyy/php:8.1.33-fpm-bookworm-php-unofficial
-      context: .
-      dockerfile: Dockerfile
     container_name: ${CONTAINER_NAME}
     restart: always
     networks:

apps/php-unofficial/8.4.13/Dockerfile

@@ -1,6 +1,6 @@
 #Reference Links ：https://github.com/docker-library/php/issues/926#issuecomment-567230723
 
-FROM php:8.4.13-fpm
+FROM php:8.4.13-fpm-bookworm
 
 ARG UNAME=www-data
 ARG UGROUP=www-data
@@ -42,19 +42,21 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libicu-dev && \
     rm -rf /var/lib/apt/lists/*
 
-
-
 # memcached
-RUN pecl install memcached
+RUN pecl install memcached && \
-RUN docker-php-ext-enable memcached
+    docker-php-ext-enable memcached
 
 # mcrypt
-RUN pecl install mcrypt
+RUN pecl install mcrypt && \
-RUN docker-php-ext-enable mcrypt
+    docker-php-ext-enable mcrypt
 
 # redis
-RUN pecl install redis
+RUN pecl install redis && \
-RUN docker-php-ext-enable redis
+    docker-php-ext-enable redis
+
+# imap
+RUN pecl install imap && \
+    docker-php-ext-enable imap
 
 #pecl temporarily does not support PHP8.1 api installation rar
 #Reference Links ：https://stackoverflow.com/questions/73564424/error-while-installing-php-rar-extension-on-ubuntu-server
@@ -68,14 +70,12 @@ RUN docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-w
 && docker-php-ext-configure mysqli --with-mysqli=mysqlnd \
 && docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
 && docker-php-ext-configure zip \
-&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
 && docker-php-ext-install -j "$(nproc)" \
     gd \
     intl \
     mysqli \
     pdo_mysql \
     zip \
-    imap \
     fileinfo \
     xsl \
     bcmath \
@@ -91,5 +91,3 @@ RUN docker-php-ext-enable imagick
 RUN echo "extension=redis.so" >> /usr/local/etc/php/php.ini
 
 WORKDIR /www
-
-

apps/php-unofficial/8.4.13/docker-compose.yml

@@ -1,8 +1,6 @@
 services:
-  php81:
+  php84:
-    build:
+    image: ghcr.io/pooneyy/php:8.4.13-fpm-bookworm-php-unofficial
-      context: .
-      dockerfile: Dockerfile
     container_name: ${CONTAINER_NAME}
     restart: always
     networks:

apps/php-unofficial/data.yml

@@ -1,20 +1,20 @@
-name: PHP-Unofficial
+name: PHP-Unofficial
-tags:
+tags:
-    - 工具
+    - 工具
-title: PHP是一种流行的服务器端脚本语言
+title: PHP是一种流行的服务器端脚本语言
-type: 工具
+type: 工具
-description: PHP是一种流行的服务器端脚本语言
+description: PHP是一种流行的服务器端脚本语言
-additionalProperties:
+additionalProperties:
-    key: php-unofficial
+    key: php-unofficial
-    name: PHP-Unofficial
+    name: PHP-Unofficial
-    tags:
+    tags:
-        - Tool
+        - Tool
-    shortDescZh: PHP是一种流行的服务器端脚本语言
+    shortDescZh: PHP是一种流行的服务器端脚本语言
-    shortDescEn: PHP is a popular server-side scripting language
+    shortDescEn: PHP is a popular server-side scripting language
-    type: tool
+    type: tool
-    crossVersionUpdate: false
+    crossVersionUpdate: false
-    limit: 0
+    limit: 0
-    recommend: 0
+    recommend: 0
-    website: https://www.php.net/
+    website: https://www.php.net/
-    github: https://github.com/php/php-src
+    github: https://github.com/php/php-src
-    document: https://www.php.net/docs.php
+    document: https://www.php.net/docs.php

apps/picx/3.0.2/.env.sample

@@ -0,0 +1,3 @@
+CONTAINER_NAME="picx"
+PANEL_APP_PORT_HTTP="40131"
+DATA_PATH="./data"

apps/picx/3.0.2/data.yml

@@ -0,0 +1,17 @@
+additionalProperties:
+  formFields:
+    - default: 40131
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: ./data
+      edit: true
+      envKey: DATA_PATH
+      labelEn: Data folder path
+      labelZh: 数据文件夹路径
+      required: true
+      type: text

apps/picx/3.0.2/docker-compose.yml

@@ -0,0 +1,17 @@
+services:
+  picx:
+    image: ghcr.io/pooneyy/picx:3.0.2
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:80"
+    volumes:
+      - ${DATA_PATH}:/usr/share/nginx/html
+    labels:  
+      createdBy: "Apps" 
+
+networks:  
+  1panel-network:  
+    external: true

apps/picx/data.yml

@@ -17,3 +17,13 @@ additionalProperties:
   website: https://picx.xpoet.cn
   github: https://github.com/XPoet/picx
   document: https://picx-docs.xpoet.cn
+  architecture: 
+    - linux/amd64
+    - linux/arm64
+    - linux/ppc64le
+    - linux/riscv64
+    - linux/s390x
+    - linux/arm/v7
+    - linux/arm/v6
+    - linux/386
+

apps/picx/latest/Dockerfile

@@ -12,7 +12,7 @@ RUN apk update && \
 RUN git clone -b gh-pages https://github.com/XPoet/picx
 
 # 将entrypoint.sh脚本文件复制到工作目录/app/
-COPY entrypoint.sh /app/
+COPY apps/picx/latest/entrypoint.sh /app/
 # 赋予entrypoint.sh脚本文件可执行权限
 RUN chmod +x /app/entrypoint.sh
 

apps/picx/latest/docker-compose.yml

@@ -1,9 +1,6 @@
 services:
   picx:
-    build:
+    image: ghcr.io/pooneyy/picx:latest
-      context: .
-      dockerfile: Dockerfile
-    image: picx:latest
     container_name: ${CONTAINER_NAME}
     restart: always
     networks:

apps/port-forward-agent/1.3.7/Dockerfile

@@ -1,18 +0,0 @@
-FROM debian:bullseye-slim
-
-RUN mkdir -p /app/pfg
-
-WORKDIR /app/pfg
-
-RUN apt-get update && apt-get upgrade -y && \
-    apt-get install -y wget unzip tzdata
-
-RUN wget -O pfg.zip https://gitee.com/tavenli/port-forward/releases/download/v1.3.7/forward-agent.linux64.v1.3.7.zip && \
-    unzip pfg.zip && \
-    chmod +x /app/pfg/forward-agent/forward-agent
-
-ENV TZ=Asia/Shanghai
-
-WORKDIR /app/pfg/forward-agent
-
-CMD ["./forward-agent"]

apps/port-forward-agent/data.yml

@@ -1,19 +0,0 @@
-name: Port-Forward-Agent
-tags:
-  - 工具
-title: Go 语言开发的端口转发工具 (客户端)
-description: Go 语言开发的端口转发工具 (客户端)
-additionalProperties:
-  key: port-forward-agent
-  name: Port-Forward-Agent
-  tags:
-    - Tool
-  shortDescZh: Go 语言开发的端口转发工具 (客户端)
-  shortDescEn: Port forwarding tool developed in Go (Agent)
-  type: tool
-  crossVersionUpdate: true
-  limit: 1
-  recommend: 0
-  website: https://gitee.com/tavenli/port-forward
-  github: https://gitee.com/tavenli/port-forward
-  document: https://gitee.com/tavenli/port-forward

apps/port-forward-server/1.3.7/Dockerfile

@@ -1,19 +0,0 @@
-FROM debian:bullseye-slim
-
-RUN mkdir -p /app/pfg
-
-WORKDIR /app/pfg
-
-RUN apt-get update && apt-get upgrade -y && \
-    apt-get install -y wget unzip tzdata
-
-RUN wget -O pfg.zip https://gitee.com/tavenli/port-forward/releases/download/v1.3.7/forward-server.linux64.v1.3.7.zip && \
-    unzip pfg.zip && \
-    chmod +x /app/pfg/forward-server/start.sh && \
-    chmod +x /app/pfg/forward-server/forward-server
-
-ENV TZ=Asia/Shanghai
-
-WORKDIR /app/pfg/forward-server
-
-CMD ["./forward-server"]

apps/port-forward-server/README.md

@@ -1,74 +0,0 @@
-# 使用说明
-- 控制台：http://IP:Port/login
-
-- 账户密码：
-```
-username：admin
-password：123456
-```
-
-# 原始相关
-
-# port-forward
-Go语言开发的端口转发工具  for port data forward
-
-官网地址：
-https://gitee.com/tavenli/port-forward
-
-```
-开发语言：GO
-控制台框架：beego
-数据库：sqlite3
-```
-
-# 最近更新
-```
-v1.3.6 发布，重新增加 TCP端口数据分发功能
-v1.3.5 发布，增加批量导入、批量添加规则
-v1.3.3 发布，增加 一键开启所有转发 和 一键关闭所有转发
-v1.3.2 发布，服务稳定性已经过长时间的验证
-v1.3.1 发布，增加程序启动自动开启转发
-v1.2.9_beta 发布，完善点对点转发的稳定性，支持TCP和UDP协议转发
-```
-
-# 最新编译好的版本下载：
-[https://gitee.com/tavenli/port-forward/releases](https://gitee.com/tavenli/port-forward/releases)
-
-
-
-# 功能介绍
-
-> 支持Web控制台添加端口映射
-
-> 支持对每条端口映射进行开启和关闭控制
-
-> 支持 RestfulAPI 接口，方便被其它系统集成
-
-> 支持每条端口转发的同时，再分发给多个端口，满足某些测试场景
-
-> 类似企业交换机的功能，即软交换机，主要是方便企业网络维护人员或开发人员
-
-
-# 使用交流群
-
-> 使用问题或个性化需求可加QQ号：17020415  （申请时请备注：端口转发）
-
-# 快速安装说明
-1. 下载编译好的程序包，并解压程序包
-2. 执行 start.sh （Linux）或 start.bat （Win）命令
-3. 打开浏览器，进入控制台，打开 http://127.0.0.1:8080/login
-4. 输入用户 admin  密码 123456 进入控制台
-
-
-# 控制台UI
-![登录](https://gitee.com/tavenli/port-forward/raw/master/screenshot/Login.png "在这里输入图片标题")
-
-
-![转发列表](https://gitee.com/tavenli/port-forward/raw/master/screenshot/List.png "在这里输入图片标题")
-
-
-![端口转发配置](https://gitee.com/tavenli/port-forward/raw/master/screenshot/edit.png "在这里输入图片标题")
-
-
-![方便与其它平台集成接口](https://gitee.com/tavenli/port-forward/raw/master/screenshot/ApiDoc.png "在这里输入图片标题")
-

apps/port-forward/1.3.7-agent/docker-compose.yml

@@ -1,10 +1,6 @@
 services:
-  port-forward-server:
+  port-forward-agent:
-    build:
+    image: ghcr.io/pooneyy/port-forward:1.3.7-agent
-      context: .
-      dockerfile: Dockerfile
-      args:
-        IMAGE_TAG: 1.3.7
     container_name: ${CONTAINER_NAME}
     restart: always
     network_mode: host

apps/port-forward/1.3.7-server/data/conf/app.conf

@@ -1,20 +1,20 @@
-
+
-app.name = "PortForward"
+app.name = "PortForward"
-app.cname = "端口转发系统"
+app.cname = "端口转发系统"
-servername = "PortForward-Server"
+servername = "PortForward-Server"
-runmode ="dev"
+runmode ="dev"
-#runmode ="prod"
+#runmode ="prod"
-viewspath = "views"
+viewspath = "views"
-#logfile.config = "close"
+#logfile.config = "close"
-
+
-[dev]
+[dev]
-httpaddr = "0.0.0.0"
+httpaddr = "0.0.0.0"
-httpport = 8080
+httpport = 8080
-recoverpanic = false
+recoverpanic = false
-[prod]
+[prod]
-httpaddr = "0.0.0.0"
+httpaddr = "0.0.0.0"
-httpport = 8080
+httpport = 8080
-recoverpanic = true
+recoverpanic = true
-graceful = true
+graceful = true
-
+
-include "data.conf"
+include "data.conf"

apps/port-forward/1.3.7-server/data/conf/data.conf

@@ -1,6 +1,6 @@
-magic.service = ":7000"
+magic.service = ":7000"
-api.auth = "26CCD056107481F45D1AC805A24A9E59"
+api.auth = "26CCD056107481F45D1AC805A24A9E59"
-
+
-agent.auth = "722ED8F8D9900CC1AB17243DC7B51A2D"
+agent.auth = "722ED8F8D9900CC1AB17243DC7B51A2D"
-
+
 onstart.forward = "false"

apps/port-forward/1.3.7-server/docker-compose.yml

@@ -1,10 +1,6 @@
 services:
   port-forward-server:
-    build:
+    image: ghcr.io/pooneyy/port-forward:1.3.7-server
-      context: .
-      dockerfile: Dockerfile
-      args:
-        IMAGE_TAG: 1.3.7
     container_name: ${CONTAINER_NAME}
     restart: always
     network_mode: host

apps/port-forward/Dockerfile

@@ -0,0 +1,25 @@
+FROM debian:bullseye-slim AS base
+ENV TZ=Asia/Shanghai
+RUN mkdir -p /app/pfg && \
+    apt-get update && apt-get upgrade -y && \
+    apt-get install -y wget unzip tzdata && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+WORKDIR /app/pfg
+
+FROM base AS agent
+RUN wget -O pfg.zip https://gitee.com/tavenli/port-forward/releases/download/v1.3.7/forward-agent.linux64.v1.3.7.zip && \
+    unzip pfg.zip && \
+    rm -rf pfg.zip && \
+    chmod +x /app/pfg/forward-agent/forward-agent
+WORKDIR /app/pfg/forward-agent
+CMD ["./forward-agent"]
+
+FROM base AS server
+RUN wget -O pfg.zip https://gitee.com/tavenli/port-forward/releases/download/v1.3.7/forward-server.linux64.v1.3.7.zip && \
+    unzip pfg.zip && \
+    rm -rf pfg.zip && \
+    chmod +x /app/pfg/forward-server/start.sh && \
+    chmod +x /app/pfg/forward-server/forward-server
+WORKDIR /app/pfg/forward-server
+CMD ["./forward-server"]

apps/port-forward/data.yml

@@ -1,14 +1,14 @@
 name: Port-Forward-Server
 tags:
   - 工具
-title: Go 语言开发的端口转发工具 (服务端)
+title: Go 语言开发的端口转发工具
-description: Go 语言开发的端口转发工具 (服务端)
+description: Go 语言开发的端口转发工具
 additionalProperties:
   key: port-forward-server
   name: Port-Forward-Server
   tags:
     - Tool
-  shortDescZh: Go 语言开发的端口转发工具 (服务端)
+  shortDescZh: Go 语言开发的端口转发工具
   shortDescEn: Port forwarding tool developed in Go (Server)
   type: tool
   crossVersionUpdate: true