diff --git a/apps/woodpecker/3.12.0/data.yml b/apps/woodpecker/3.12.0/data.yml index 9b78d26c9..9fa569672 100644 --- a/apps/woodpecker/3.12.0/data.yml +++ b/apps/woodpecker/3.12.0/data.yml @@ -15,6 +15,14 @@ additionalProperties: required: true rule: paramPort type: number + - default: 9000 + edit: true + envKey: PANEL_APP_PORT_GRPC + labelZh: GRPC 端口 + labelEn: GRPC port + required: true + rule: paramPort + type: number - default: "" edit: true envKey: WOODPECKER_AGENT_SECRET diff --git a/apps/woodpecker/3.12.0/docker-compose.yml b/apps/woodpecker/3.12.0/docker-compose.yml index 892f95f70..b63d6a031 100644 --- a/apps/woodpecker/3.12.0/docker-compose.yml +++ b/apps/woodpecker/3.12.0/docker-compose.yml @@ -13,6 +13,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8000 + - ${PANEL_APP_PORT_GRPC}:9000 env_file: - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} @@ -20,12 +21,9 @@ services: - ${WOODPECKER_ROOT_PATH}/server:/var/lib/woodpecker/ environment: - TZ=Asia/Shanghai - - WOODPECKER_OPEN=true - - WOODPECKER_SERVER_ADDR=:8000 - - WOODPECKER_GRPC_ADDR=0.0.0.0:9000 - WOODPECKER_AGENT_SECRET=${WOODPECKER_AGENT_SECRET} - HTTPS_PROXY=${HTTP_PROXY} - - NO_PROXY=127.0.0.1,localhost + - NO_PROXY=127.0.0.1,localhost,.local,woodpecker-server,woodpecker-agent,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 woodpecker-agent: depends_on: @@ -46,4 +44,4 @@ services: - WOODPECKER_SERVER=woodpecker-server:9000 - WOODPECKER_AGENT_SECRET=${WOODPECKER_AGENT_SECRET} - HTTPS_PROXY=${HTTP_PROXY} - - NO_PROXY=127.0.0.1,localhost + - NO_PROXY=127.0.0.1,localhost,.local,woodpecker-server,woodpecker-agent,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16