diff --git a/dockge/1.4.2/docker-compose.yml b/dockge/1.4.2/docker-compose.yml index ddfdd0053..808d63181 100644 --- a/dockge/1.4.2/docker-compose.yml +++ b/dockge/1.4.2/docker-compose.yml @@ -13,6 +13,9 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5001 + env_file: + - /etc/1panel/envs/global.env + - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${DOCKGE_ROOT_PATH}/data:/app/data - ${DOCKGE_ROOT_PATH}/stacks:/opt/dockge/stacks diff --git a/dockge/1.4.2/scripts/init.sh b/dockge/1.4.2/scripts/init.sh index c86c4fbca..77b849120 100644 --- a/dockge/1.4.2/scripts/init.sh +++ b/dockge/1.4.2/scripts/init.sh @@ -3,6 +3,11 @@ if [ -f .env ]; then source .env + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "Check Finish." else diff --git a/dockge/1.4.2/scripts/upgrade.sh b/dockge/1.4.2/scripts/upgrade.sh index c86c4fbca..77b849120 100644 --- a/dockge/1.4.2/scripts/upgrade.sh +++ b/dockge/1.4.2/scripts/upgrade.sh @@ -3,6 +3,11 @@ if [ -f .env ]; then source .env + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "Check Finish." else diff --git a/dpanel/1.1.4/data.yml b/dpanel/1.1.4/data.yml new file mode 100644 index 000000000..1a6380324 --- /dev/null +++ b/dpanel/1.1.4/data.yml @@ -0,0 +1,17 @@ +additionalProperties: + formFields: + - default: "/home/dpanel" + edit: true + envKey: DPANEL_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 8080 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number diff --git a/dpanel/1.1.4/docker-compose.yml b/dpanel/1.1.4/docker-compose.yml new file mode 100644 index 000000000..f40dce006 --- /dev/null +++ b/dpanel/1.1.4/docker-compose.yml @@ -0,0 +1,21 @@ +networks: + 1panel-network: + external: true + +services: + dpanel: + image: dpanel/dpanel:1.1.4 + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:8080 + env_file: + - /etc/1panel/envs/global.env + - ${ENV_FILE:-/etc/1panel/envs/default.env} + volumes: + - ${DPANEL_ROOT_PATH}/data:/dpanel + - /var/run/docker.sock:/var/run/docker.sock diff --git a/dpanel/1.1.4/scripts/init.sh b/dpanel/1.1.4/scripts/init.sh new file mode 100644 index 000000000..77b849120 --- /dev/null +++ b/dpanel/1.1.4/scripts/init.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/dpanel/1.1.4/scripts/uninstall.sh b/dpanel/1.1.4/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/dpanel/1.1.4/scripts/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/dpanel/1.1.4/scripts/upgrade.sh b/dpanel/1.1.4/scripts/upgrade.sh new file mode 100644 index 000000000..77b849120 --- /dev/null +++ b/dpanel/1.1.4/scripts/upgrade.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/dpanel/README.md b/dpanel/README.md new file mode 100644 index 000000000..a8d369655 --- /dev/null +++ b/dpanel/README.md @@ -0,0 +1,21 @@ +# DPanel + +Docker可视化管理面板 + +![Dockge](https://file.lifebus.top/imgs/dpanel_cover.png) + +![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) + +## 简介 + +Docker 可视化面板系统,提供完善的 docker 管理功能。 + +## 安装说明 + +> 默认用户名:`admin` +> +> 默认密码:`admin` + +--- + +![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/dpanel/data.yml b/dpanel/data.yml new file mode 100644 index 000000000..cd2dcd3c9 --- /dev/null +++ b/dpanel/data.yml @@ -0,0 +1,15 @@ +additionalProperties: + key: dpanel + name: DPanel + tags: + - WebSite + - Tool + - Local + shortDescZh: Docker可视化管理面板 + shortDescEn: Docker visual management panel + type: website + crossVersionUpdate: true + limit: 0 + website: https://dpanel.cc/ + github: https://github.com/donknap/dpanel/ + document: https://dpanel.cc/ diff --git a/dpanel/logo.png b/dpanel/logo.png new file mode 100644 index 000000000..ac30ad106 Binary files /dev/null and b/dpanel/logo.png differ