Merge branch '1Panel-dev:dev' into dev

This commit is contained in:
2024-01-29 18:48:54 +08:00
committed by GitHub
72 changed files with 60 additions and 26 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Run Renovate - name: Run Renovate
uses: renovatebot/github-action@f9c81dddc9b589e4e6ae0326d1e36f6bc415d230 # v39.2.4 uses: renovatebot/github-action@42c1d3cb1d1ca891765626ba71cdff5e757258de # v40.0.2
with: with:
useSlim: false useSlim: false
token: ${{ secrets.GITHUBTOKEN }} token: ${{ secrets.GITHUBTOKEN }}
@@ -16,7 +16,7 @@ services:
- PASSWORD=${WEB_PASSWORD} - PASSWORD=${WEB_PASSWORD}
- SUDO_PASSWORD=${SUDO_PASSWORD} - SUDO_PASSWORD=${SUDO_PASSWORD}
- DEFAULT_WORKSPACE=/config/workspace - DEFAULT_WORKSPACE=/config/workspace
image: linuxserver/code-server:4.20.0 image: linuxserver/code-server:4.20.1
labels: labels:
createdBy: "Apps" createdBy: "Apps"
networks: networks:
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
consul: consul:
image: hashicorp/consul:1.17.1 image: hashicorp/consul:1.17.2
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
restart: always restart: always
ports: ports:
@@ -8,6 +8,6 @@ services:
- "${PANEL_APP_PORT_HTTP}:9876" - "${PANEL_APP_PORT_HTTP}:9876"
volumes: volumes:
- ./data:/root - ./data:/root
image: jeessy/ddns-go:v6.0.3 image: jeessy/ddns-go:v6.1.0
labels: labels:
createdBy: "Apps" createdBy: "Apps"
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
dockge: dockge:
image: louislam/dockge:1.4.1 image: louislam/dockge:1.4.2
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
restart: unless-stopped restart: unless-stopped
ports: ports:
@@ -10,7 +10,7 @@ services:
volumes: volumes:
- "./data/database:/app/database" - "./data/database:/app/database"
- "./data/logs:/app/logs" - "./data/logs:/app/logs"
image: mouday/domain-admin:v1.5.36 image: mouday/domain-admin:v1.6.1
labels: labels:
createdBy: "Apps" createdBy: "Apps"
networks: networks:
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
drawio: drawio:
image: jgraph/drawio:22.1.21 image: jgraph/drawio:23.0.2
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
restart: unless-stopped restart: unless-stopped
networks: networks:
+18
View File
@@ -0,0 +1,18 @@
additionalProperties:
formFields:
- default: 8080
edit: true
envKey: PANEL_APP_PORT_HTTP
labelEn: HTTP Port
labelZh: HTTP 端口
required: true
rule: paramPort
type: number
- default: 6443
edit: true
envKey: PANEL_APP_PORT_HTTPS
labelEn: HTTPS Port
labelZh: HTTPS 端口
required: true
rule: paramPort
type: number
+16
View File
@@ -0,0 +1,16 @@
version: '3'
services:
drawio:
image: jgraph/drawio:23.0.2
container_name: ${CONTAINER_NAME}
restart: unless-stopped
networks:
- 1panel-network
ports:
- ${PANEL_APP_PORT_HTTP}:8080
- ${PANEL_APP_PORT_HTTPS}:8443
labels:
createdBy: "Apps"
networks:
1panel-network:
external: true
@@ -11,7 +11,7 @@ services:
- "./data/data:/usr/share/elasticsearch/data" - "./data/data:/usr/share/elasticsearch/data"
- "./data/backup:/usr/share/elasticsearch/backup" - "./data/backup:/usr/share/elasticsearch/backup"
- "./data/conf/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml" - "./data/conf/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml"
image: elasticsearch:7.17.16 image: elasticsearch:7.17.17
ulimits: ulimits:
memlock: memlock:
soft: -1 soft: -1
@@ -11,7 +11,7 @@ services:
- "./data/data:/usr/share/elasticsearch/data" - "./data/data:/usr/share/elasticsearch/data"
- "./data/backup:/usr/share/elasticsearch/backup" - "./data/backup:/usr/share/elasticsearch/backup"
- "./data/conf/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml" - "./data/conf/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml"
image: elasticsearch:8.11.4 image: elasticsearch:8.12.0
ulimits: ulimits:
memlock: memlock:
soft: -1 soft: -1
@@ -2,7 +2,7 @@ version: '3'
services: services:
grafana: grafana:
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
image: grafana/grafana:10.2.3 image: grafana/grafana:10.3.1
restart: always restart: always
user: '0' user: '0'
networks: networks:
@@ -2,7 +2,7 @@ version: '3'
services: services:
jenkins: jenkins:
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
image: jenkins/jenkins:2.441 image: jenkins/jenkins:2.442
restart: always restart: always
privileged: true privileged: true
user: root user: root
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
jumpserver: jumpserver:
image: jumpserver/jms_all:v3.10.1 image: jumpserver/jms_all:v3.10.3
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
privileged: true privileged: true
restart: always restart: always
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
koishi: koishi:
image: koishijs/koishi:v1.13.5 image: koishijs/koishi:v1.13.6
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
restart: always restart: always
environment: environment:
@@ -11,7 +11,7 @@ services:
volumes: volumes:
- ./data:/data - ./data:/data
- ./config:/config - ./config:/config
image: gotson/komga:1.10.1 image: gotson/komga:1.10.3
labels: labels:
createdBy: "Apps" createdBy: "Apps"
networks: networks:
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
kubepi: kubepi:
image: 1panel/kubepi:v1.6.5 image: 1panel/kubepi:v1.7.0
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
restart: always restart: always
networks: networks:
@@ -16,7 +16,7 @@ services:
environment: environment:
- MADDY_HOSTNAME=${MAIL_HOSTNAME} - MADDY_HOSTNAME=${MAIL_HOSTNAME}
- MADDY_DOMAIN=${MAIL_DOMAIN} - MADDY_DOMAIN=${MAIL_DOMAIN}
image: foxcpp/maddy:0.7.0 image: foxcpp/maddy:0.7.1
labels: labels:
createdBy: "Apps" createdBy: "Apps"
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
mailserver: mailserver:
image: ghcr.io/docker-mailserver/docker-mailserver:13.2.0 image: ghcr.io/docker-mailserver/docker-mailserver:13.3.1
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
hostname: ${MS_HOSTNAME} hostname: ${MS_HOSTNAME}
env_file: ./conf/mailserver.env env_file: ./conf/mailserver.env
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
memos: memos:
image: neosmemo/memos:0.18.2 image: neosmemo/memos:0.19.0
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
restart: always restart: always
networks: networks:
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
memos: memos:
image: neosmemo/memos:0.18.2 image: neosmemo/memos:0.19.0
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
restart: always restart: always
networks: networks:
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
mkdocs-material: mkdocs-material:
image: squidfunk/mkdocs-material:9.5.4 image: squidfunk/mkdocs-material:9.5.6
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
restart: always restart: always
networks: networks:
@@ -2,7 +2,7 @@ version: '3'
services: services:
mysql: mysql:
image: mysql:8.2.0 image: mysql:8.3.0
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
restart: always restart: always
environment: environment:
@@ -12,7 +12,7 @@ services:
volumes: volumes:
- ./data/data:/data - ./data/data:/data
- ./data/ssl:/etc/letsencrypt - ./data/ssl:/etc/letsencrypt
image: jc21/nginx-proxy-manager:2.10.4 image: jc21/nginx-proxy-manager:2.11.1
labels: labels:
createdBy: "Apps" createdBy: "Apps"
networks: networks:
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
redpanda-console: redpanda-console:
image: redpandadata/console:v2.3.9 image: redpandadata/console:v2.4.0
restart: always restart: always
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
networks: networks:
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
roundcube: roundcube:
image: roundcube/roundcubemail:1.6.5-apache image: roundcube/roundcubemail:1.6.6-apache
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
restart: always restart: always
environment: environment:
@@ -2,7 +2,7 @@ version: '3'
services: services:
twikoo: twikoo:
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
image: imaegoo/twikoo:1.6.30 image: imaegoo/twikoo:1.6.31
restart: always restart: always
ports: ports:
- ${PANEL_APP_PORT_HTTP}:8080 - ${PANEL_APP_PORT_HTTP}:8080
@@ -4,7 +4,7 @@ networks:
services: services:
uuwaf: uuwaf:
image: uusec/nanqiang:v2.8.0 image: uusec/nanqiang:v3.0.1
ulimits: ulimits:
nproc: 65535 nproc: 65535
nofile: nofile: