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:
+1
-1
@@ -4,7 +4,7 @@ networks:
|
||||
|
||||
services:
|
||||
element-web:
|
||||
image: vectorim/element-web:v1.12.15
|
||||
image: vectorim/element-web:v1.12.16
|
||||
container_name: ${CONTAINER_NAME}
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
@@ -4,7 +4,7 @@ networks:
|
||||
|
||||
services:
|
||||
ghost:
|
||||
image: ghost:6.32.0
|
||||
image: ghost:6.35.0
|
||||
container_name: ${CONTAINER_NAME}
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
+1
-1
@@ -4,7 +4,7 @@ networks:
|
||||
|
||||
services:
|
||||
gitea:
|
||||
image: gitea/act_runner:0.5.0
|
||||
image: gitea/act_runner:0.6.0
|
||||
container_name: ${CONTAINER_NAME}
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
+1
-1
@@ -4,7 +4,7 @@ networks:
|
||||
|
||||
services:
|
||||
movie-pilot:
|
||||
image: jxxghp/moviepilot:2.10.6
|
||||
image: jxxghp/moviepilot:2.10.7
|
||||
container_name: ${CONTAINER_NAME}
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
@@ -4,7 +4,7 @@ networks:
|
||||
|
||||
services:
|
||||
n8n:
|
||||
image: n8nio/n8n:2.18.4
|
||||
image: n8nio/n8n:2.19.0
|
||||
container_name: ${CONTAINER_NAME}
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
@@ -4,7 +4,7 @@ networks:
|
||||
|
||||
services:
|
||||
ollama:
|
||||
image: ollama/ollama:0.21.2
|
||||
image: ollama/ollama:0.22.0
|
||||
container_name: ${CONTAINER_NAME}
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
@@ -4,7 +4,7 @@ networks:
|
||||
|
||||
services:
|
||||
opengist:
|
||||
image: thomiceli/opengist:1.12.1
|
||||
image: thomiceli/opengist:1.12.2
|
||||
container_name: ${CONTAINER_NAME}
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
@@ -4,7 +4,7 @@ networks:
|
||||
|
||||
services:
|
||||
synapse-init:
|
||||
image: matrixdotorg/synapse:v1.151.0
|
||||
image: matrixdotorg/synapse:v1.152.0
|
||||
container_name: init-${CONTAINER_NAME}
|
||||
entrypoint:
|
||||
- /start.py
|
||||
@@ -22,7 +22,7 @@ services:
|
||||
- SYNAPSE_NO_TLS=true
|
||||
- SYNAPSE_HTTP_PORT=8008
|
||||
synapse:
|
||||
image: matrixdotorg/synapse:v1.151.0
|
||||
image: matrixdotorg/synapse:v1.152.0
|
||||
container_name: ${CONTAINER_NAME}
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
+1
-1
@@ -7,7 +7,7 @@ services:
|
||||
env_file:
|
||||
- ./envs/global.env
|
||||
- .env
|
||||
image: vectorim/element-web:v1.12.15
|
||||
image: vectorim/element-web:v1.12.16
|
||||
labels:
|
||||
createdBy: Apps
|
||||
networks:
|
||||
@@ -3,6 +3,15 @@
|
||||
if [ -f .env ]; then
|
||||
source .env
|
||||
|
||||
# setup-1 add default values
|
||||
CURRENT_DIR=$(pwd)
|
||||
sed -i '/^ENV_FILE=/d' .env
|
||||
sed -i '/^GLOBAL_ENV_FILE=/d' .env
|
||||
sed -i '/^APP_ENV_FILE=/d' .env
|
||||
echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
|
||||
echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
|
||||
echo "APP_ENV_FILE=${CURRENT_DIR}/envs/gitea.env" >> .env
|
||||
|
||||
echo "Check Finish."
|
||||
|
||||
else
|
||||
|
||||
@@ -3,6 +3,15 @@
|
||||
if [ -f .env ]; then
|
||||
source .env
|
||||
|
||||
# setup-1 add default values
|
||||
CURRENT_DIR=$(pwd)
|
||||
sed -i '/^ENV_FILE=/d' .env
|
||||
sed -i '/^GLOBAL_ENV_FILE=/d' .env
|
||||
sed -i '/^APP_ENV_FILE=/d' .env
|
||||
echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
|
||||
echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
|
||||
echo "APP_ENV_FILE=${CURRENT_DIR}/envs/gitea.env" >> .env
|
||||
|
||||
echo "Check Finish."
|
||||
|
||||
else
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ services:
|
||||
- TZ=Asia/Shanghai
|
||||
- PUID=1000
|
||||
- PGID=1000
|
||||
image: linuxserver/jackett:0.24.1787
|
||||
image: linuxserver/jackett:0.24.1789
|
||||
labels:
|
||||
createdBy: Apps
|
||||
networks:
|
||||
+1
-1
@@ -14,7 +14,7 @@ services:
|
||||
- DEV=false
|
||||
- LOG_LEVEL=INFO
|
||||
- PASSKEY_ALLOW_REGISTER_WITHOUT_OTP=true
|
||||
image: jxxghp/moviepilot:2.10.6
|
||||
image: jxxghp/moviepilot:2.10.7
|
||||
labels:
|
||||
createdBy: Apps
|
||||
logging:
|
||||
+1
-1
@@ -34,7 +34,7 @@ services:
|
||||
- ENCRYPT_ENABLE=false
|
||||
- DB_HOST=mx-mongo
|
||||
- REDIS_HOST=mx-redis
|
||||
image: innei/mx-server:11.4.2
|
||||
image: innei/mx-server:11.4.3
|
||||
labels:
|
||||
createdBy: Apps
|
||||
networks:
|
||||
+1
-1
@@ -13,7 +13,7 @@ services:
|
||||
- DEMO=false
|
||||
- NODE_ENV=production
|
||||
- ENCRYPT_ENABLE=false
|
||||
image: innei/mx-server:11.4.2
|
||||
image: innei/mx-server:11.4.3
|
||||
labels:
|
||||
createdBy: Apps
|
||||
networks:
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user