From be15edf08c066dad6c1a87d578d95ad3b01551dd Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 1 Jun 2021 10:49:01 +0800 Subject: [PATCH] update Former-commit-id: 0459047124f6c70de489b472d86deee9db7ba314 Former-commit-id: 66e2b5d312f8f40644191681d5fd375b2652a797 --- labs/docker-lan/.env.example | 25 +++++++++++++------------ labs/docker-lan/docker-compose.yml | 6 +++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/labs/docker-lan/.env.example b/labs/docker-lan/.env.example index 44644d37..2314345b 100644 --- a/labs/docker-lan/.env.example +++ b/labs/docker-lan/.env.example @@ -1,18 +1,19 @@ TZ=Asia/Shanghai -IP=172.20.32.1 -PORT=9080 -#windows:DOCKER_SOCK=//var/run/docker.sock -#linux:DOCKER_SOCK=/var/run/docker.sock -DOCKER_SOCK=//var/run/docker.sock -#gitea -GITEA_HTTP_PORT=3000 -GITEA_SSH_PORT=3022 +# required +IP= -#drone -DRONE_SERVER_HTTP_PORT=9080 -DRONE_SERVER_HTTPS_PORT=9443 +# linux +DOCKER_SOCK=/var/run/docker.sock + +# gitea +# required DRONE_GITEA_CLIENT_ID=d3348ec2-ec0d-4a76-a80c-c668b7a5b998 +# required DRONE_GITEA_CLIENT_SECRET=Tuh4cP1qaDjBb9fVES6fgQb7VXhKzoYttuPvKnqfl-k= + +# drone +DRONE_SERVER_HTTP_PORT=9080 +DRONE_SERVER_HTTPS_PORT=9443 +DRONE_SERVER_PROTO=http DRONE_RPC_SECRET=bea26a2221fd8090ea38720fc445eca6 -DRONE_SERVER_PROTO=http \ No newline at end of file diff --git a/labs/docker-lan/docker-compose.yml b/labs/docker-lan/docker-compose.yml index 029d1169..256ec4d9 100644 --- a/labs/docker-lan/docker-compose.yml +++ b/labs/docker-lan/docker-compose.yml @@ -59,8 +59,8 @@ services: - USER_UID=1000 - USER_GID=1000 ports: - - ${GITEA_HTTP_PORT}:3000 - - ${GITEA_SSH_PORT}:22 + - 3000:3000 + - 3022:22 volumes: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro @@ -70,7 +70,7 @@ services: restart: always ports: - ${DRONE_SERVER_HTTP_PORT}:80 - - ${DRONE_SERVER_HTTPS_PORT}:443 + - 9443:443 environment: - DRONE_GITEA_SERVER=http://${IP}:3000 - DRONE_GITEA_CLIENT_ID=${DRONE_GITEA_CLIENT_ID}