mirror of
https://github.com/QYG2297248353/appstore-1panel.git
synced 2026-06-16 01:02:14 +08:00
Merge remote-tracking branch 'origin/custom' into custom
This commit is contained in:
@@ -4,7 +4,7 @@ networks:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
ammds:
|
ammds:
|
||||||
image: qyg2297248353/ammds:v1.6.34-ol8
|
image: qyg2297248353/ammds:v1.6.35-ol8
|
||||||
container_name: ${CONTAINER_NAME}
|
container_name: ${CONTAINER_NAME}
|
||||||
labels:
|
labels:
|
||||||
createdBy: "Apps"
|
createdBy: "Apps"
|
||||||
@@ -4,7 +4,7 @@ networks:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
ammds:
|
ammds:
|
||||||
image: qyg2297248353/ammds:v1.6.34
|
image: qyg2297248353/ammds:v1.6.35
|
||||||
container_name: ${CONTAINER_NAME}
|
container_name: ${CONTAINER_NAME}
|
||||||
labels:
|
labels:
|
||||||
createdBy: "Apps"
|
createdBy: "Apps"
|
||||||
@@ -50,7 +50,7 @@ services:
|
|||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
redis:
|
redis:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
image: ghcr.io/leslieleung/glean-backend:0.2.1
|
image: ghcr.io/leslieleung/glean-backend:0.2.2
|
||||||
container_name: ${CONTAINER_NAME}
|
container_name: ${CONTAINER_NAME}
|
||||||
labels:
|
labels:
|
||||||
createdBy: "Apps"
|
createdBy: "Apps"
|
||||||
@@ -87,7 +87,7 @@ services:
|
|||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
backend:
|
backend:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
image: ghcr.io/leslieleung/glean-backend:0.2.1
|
image: ghcr.io/leslieleung/glean-backend:0.2.2
|
||||||
container_name: ${CONTAINER_NAME}-worker
|
container_name: ${CONTAINER_NAME}-worker
|
||||||
environment:
|
environment:
|
||||||
DATABASE_URL: postgresql+asyncpg://${POSTGRES_USER:-glean}:${POSTGRES_PASSWORD:-glean}@postgres:5432/${POSTGRES_DB:-glean}
|
DATABASE_URL: postgresql+asyncpg://${POSTGRES_USER:-glean}:${POSTGRES_PASSWORD:-glean}@postgres:5432/${POSTGRES_DB:-glean}
|
||||||
@@ -104,7 +104,7 @@ services:
|
|||||||
web:
|
web:
|
||||||
depends_on:
|
depends_on:
|
||||||
- backend
|
- backend
|
||||||
image: ghcr.io/leslieleung/glean-web:0.2.1
|
image: ghcr.io/leslieleung/glean-web:0.2.2
|
||||||
container_name: ${CONTAINER_NAME}-web
|
container_name: ${CONTAINER_NAME}-web
|
||||||
ports:
|
ports:
|
||||||
- "${PANEL_APP_PORT_HTTP:-80}:80"
|
- "${PANEL_APP_PORT_HTTP:-80}:80"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ networks:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
n8n:
|
n8n:
|
||||||
image: n8nio/n8n:1.123.6
|
image: n8nio/n8n:1.123.7
|
||||||
container_name: ${CONTAINER_NAME}
|
container_name: ${CONTAINER_NAME}
|
||||||
labels:
|
labels:
|
||||||
createdBy: "Apps"
|
createdBy: "Apps"
|
||||||
@@ -4,7 +4,7 @@ networks:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
nodebb:
|
nodebb:
|
||||||
image: ghcr.io/nodebb/nodebb:4.7.0
|
image: ghcr.io/nodebb/nodebb:4.7.1
|
||||||
container_name: ${CONTAINER_NAME}
|
container_name: ${CONTAINER_NAME}
|
||||||
labels:
|
labels:
|
||||||
createdBy: "Apps"
|
createdBy: "Apps"
|
||||||
@@ -4,7 +4,7 @@ networks:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
nodebb:
|
nodebb:
|
||||||
image: ghcr.io/nodebb/nodebb:4.7.0
|
image: ghcr.io/nodebb/nodebb:4.7.1
|
||||||
container_name: ${CONTAINER_NAME}
|
container_name: ${CONTAINER_NAME}
|
||||||
labels:
|
labels:
|
||||||
createdBy: "Apps"
|
createdBy: "Apps"
|
||||||
+1
-1
@@ -23,7 +23,7 @@ services:
|
|||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3
|
retries: 3
|
||||||
rsshub:
|
rsshub:
|
||||||
image: diygod/rsshub:2025-12-15
|
image: diygod/rsshub:2025-12-17
|
||||||
container_name: rsshub-${CONTAINER_NAME}
|
container_name: rsshub-${CONTAINER_NAME}
|
||||||
depends_on:
|
depends_on:
|
||||||
- browserless
|
- browserless
|
||||||
+1
-1
@@ -4,7 +4,7 @@ networks:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
speedtest-tracker:
|
speedtest-tracker:
|
||||||
image: linuxserver/speedtest-tracker:1.13.0
|
image: linuxserver/speedtest-tracker:1.13.1
|
||||||
container_name: ${CONTAINER_NAME}
|
container_name: ${CONTAINER_NAME}
|
||||||
labels:
|
labels:
|
||||||
createdBy: "Apps"
|
createdBy: "Apps"
|
||||||
+1
-1
@@ -4,7 +4,7 @@ networks:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
speedtest-tracker:
|
speedtest-tracker:
|
||||||
image: linuxserver/speedtest-tracker:1.13.0
|
image: linuxserver/speedtest-tracker:1.13.1
|
||||||
container_name: ${CONTAINER_NAME}
|
container_name: ${CONTAINER_NAME}
|
||||||
labels:
|
labels:
|
||||||
createdBy: "Apps"
|
createdBy: "Apps"
|
||||||
@@ -4,7 +4,7 @@ networks:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
weblate:
|
weblate:
|
||||||
image: weblate/weblate:5.15.0.1
|
image: weblate/weblate:5.15.0.2
|
||||||
container_name: ${CONTAINER_NAME}
|
container_name: ${CONTAINER_NAME}
|
||||||
labels:
|
labels:
|
||||||
createdBy: "Apps"
|
createdBy: "Apps"
|
||||||
+1
-1
@@ -11,7 +11,7 @@ services:
|
|||||||
- TZ=Asia/Shanghai
|
- TZ=Asia/Shanghai
|
||||||
- NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080}
|
- NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080}
|
||||||
- AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523}
|
- AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523}
|
||||||
image: qyg2297248353/ammds:v1.6.34-ol8
|
image: qyg2297248353/ammds:v1.6.35-ol8
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
network_mode: ${NETWORK_MODE:-host}
|
network_mode: ${NETWORK_MODE:-host}
|
||||||
@@ -11,7 +11,7 @@ services:
|
|||||||
- TZ=Asia/Shanghai
|
- TZ=Asia/Shanghai
|
||||||
- NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080}
|
- NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080}
|
||||||
- AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523}
|
- AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523}
|
||||||
image: qyg2297248353/ammds:v1.6.34
|
image: qyg2297248353/ammds:v1.6.35
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
network_mode: ${NETWORK_MODE:-host}
|
network_mode: ${NETWORK_MODE:-host}
|
||||||
@@ -58,7 +58,7 @@ services:
|
|||||||
- -f
|
- -f
|
||||||
- http://localhost:8000/api/health
|
- http://localhost:8000/api/health
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
image: ghcr.io/leslieleung/glean-backend:0.2.1
|
image: ghcr.io/leslieleung/glean-backend:0.2.2
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
networks:
|
networks:
|
||||||
@@ -113,7 +113,7 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- ./envs/global.env
|
- ./envs/global.env
|
||||||
- .env
|
- .env
|
||||||
image: ghcr.io/leslieleung/glean-web:0.2.1
|
image: ghcr.io/leslieleung/glean-web:0.2.2
|
||||||
networks:
|
networks:
|
||||||
- glean-network
|
- glean-network
|
||||||
ports:
|
ports:
|
||||||
@@ -141,7 +141,7 @@ services:
|
|||||||
DATABASE_URL: postgresql+asyncpg://${POSTGRES_USER:-glean}:${POSTGRES_PASSWORD:-glean}@postgres:5432/${POSTGRES_DB:-glean}
|
DATABASE_URL: postgresql+asyncpg://${POSTGRES_USER:-glean}:${POSTGRES_PASSWORD:-glean}@postgres:5432/${POSTGRES_DB:-glean}
|
||||||
REDIS_URL: redis://redis:6379/0
|
REDIS_URL: redis://redis:6379/0
|
||||||
SECRET_KEY: ${SECRET_KEY:-}
|
SECRET_KEY: ${SECRET_KEY:-}
|
||||||
image: ghcr.io/leslieleung/glean-backend:0.2.1
|
image: ghcr.io/leslieleung/glean-backend:0.2.2
|
||||||
networks:
|
networks:
|
||||||
- glean-network
|
- glean-network
|
||||||
restart: always
|
restart: always
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ services:
|
|||||||
- N8N_PROTOCOL=http
|
- N8N_PROTOCOL=http
|
||||||
- N8N_DIAGNOSTICS_ENABLED=false
|
- N8N_DIAGNOSTICS_ENABLED=false
|
||||||
- N8N_SECURE_COOKIE=false
|
- N8N_SECURE_COOKIE=false
|
||||||
image: n8nio/n8n:1.123.6
|
image: n8nio/n8n:1.123.7
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
networks:
|
networks:
|
||||||
+2
-2
@@ -3,13 +3,13 @@ networks:
|
|||||||
external: true
|
external: true
|
||||||
services:
|
services:
|
||||||
nodebb:
|
nodebb:
|
||||||
container_name: 4.7.0
|
container_name: 4.7.1
|
||||||
env_file:
|
env_file:
|
||||||
- ./envs/global.env
|
- ./envs/global.env
|
||||||
- .env
|
- .env
|
||||||
environment:
|
environment:
|
||||||
- TZ=Asia/Shanghai
|
- TZ=Asia/Shanghai
|
||||||
image: ghcr.io/nodebb/nodebb:4.7.0
|
image: ghcr.io/nodebb/nodebb:4.7.1
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
networks:
|
networks:
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user