diff --git a/labs/docker-lan/docker-compose.yml b/labs/docker-lan/docker-compose.yml index 96ef1f0d..9d714b78 100644 --- a/labs/docker-lan/docker-compose.yml +++ b/labs/docker-lan/docker-compose.yml @@ -8,7 +8,7 @@ networks: - subnet: 172.172.0.0/24 services: portainer: - image: portainer/portainer-ce:2.5.0 + image: portainer/portainer-ce:2.5.1 restart: always ports: - 8000:8000 @@ -16,21 +16,21 @@ services: volumes: - ${DOCKER_SOCK}:/var/run/docker.sock - ./data/portainer:/data - netdata: - image: netdata/netdata:v1.30.0 - restart: always - ports: - - 19999:19999 - cap_add: - - SYS_PTRACE - security_opt: - - apparmor:unconfined - volumes: - - /etc/passwd:/host/etc/passwd:ro - - /etc/group:/host/etc/group:ro - - /proc:/host/proc:ro - - /sys:/host/sys:ro - - /etc/os-release:/host/etc/os-release:ro + # netdata: + # image: netdata/netdata:v1.30.0 + # restart: always + # ports: + # - 19999:19999 + # cap_add: + # - SYS_PTRACE + # security_opt: + # - apparmor:unconfined + # volumes: + # - /etc/passwd:/host/etc/passwd:ro + # - /etc/group:/host/etc/group:ro + # - /proc:/host/proc:ro + # - /sys:/host/sys:ro + # - /etc/os-release:/host/etc/os-release:ro registry: #https://docs.docker.com/registry/deploying/ image: registry:2.7.1 restart: always @@ -60,7 +60,7 @@ services: - USER_GID=1000 ports: - 3000:3000 - - 3022:22 + - 222:22 volumes: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro @@ -84,6 +84,7 @@ services: - ./data/drone:/data depends_on: - gitea + - registry drone-runner-docker: image: drone/drone-runner-docker:1.6.3 restart: always @@ -92,7 +93,7 @@ services: - 3001:3000 environment: - DRONE_RPC_PROTO=${DRONE_SERVER_PROTO} - - DRONE_RPC_HOST=${IP}:${DRONE_SERVER_HTTP_PORT} + - DRONE_RPC_HOST=drone - DRONE_RPC_SECRET=${DRONE_RPC_SECRET} - DRONE_RUNNER_CAPACITY=2 - DRONE_RUNNER_NAME=Local-Runner @@ -100,24 +101,25 @@ services: - ${DOCKER_SOCK}:/var/run/docker.sock depends_on: - drone - dnsmasq: - image: jpillora/dnsmasq:1.1.0 - restart: always - cap_add: - - NET_ADMIN - ports: - - 53:53/udp - - 10000:8080 - volumes: - - ./conf/dnsmasq/dnsmasq.conf:/etc/dnsmasq.conf - nginx: - image: nginx:1.20.0 - restart: always - environment: - TZ: "Asia/Shanghai" - ports: - - 80:80 - - 443:443 - volumes: - - ./conf/nginx/conf.d:/etc/nginx/conf.d - - ./log/nginx:/var/log/nginx + - registry + # dnsmasq: + # image: jpillora/dnsmasq:1.1.0 + # restart: always + # cap_add: + # - NET_ADMIN + # ports: + # - 53:53/udp + # - 10000:8080 + # volumes: + # - ./conf/dnsmasq/dnsmasq.conf:/etc/dnsmasq.conf + # nginx: + # image: nginx:1.20.0 + # restart: always + # environment: + # TZ: "Asia/Shanghai" + # ports: + # - 80:80 + # - 443:443 + # volumes: + # - ./conf/nginx/conf.d:/etc/nginx/conf.d + # - ./log/nginx:/var/log/nginx diff --git a/labs/docker-lan/conf/drone/example/.drone.yml b/labs/docker-lan/examples/go/.drone.yml similarity index 100% rename from labs/docker-lan/conf/drone/example/.drone.yml rename to labs/docker-lan/examples/go/.drone.yml diff --git a/labs/docker-lan/conf/drone/example/Dockerfile b/labs/docker-lan/examples/go/Dockerfile similarity index 100% rename from labs/docker-lan/conf/drone/example/Dockerfile rename to labs/docker-lan/examples/go/Dockerfile diff --git a/labs/docker-lan/conf/drone/example/README.md b/labs/docker-lan/examples/go/README.md similarity index 100% rename from labs/docker-lan/conf/drone/example/README.md rename to labs/docker-lan/examples/go/README.md diff --git a/labs/docker-lan/conf/drone/example/app.go b/labs/docker-lan/examples/go/app.go similarity index 100% rename from labs/docker-lan/conf/drone/example/app.go rename to labs/docker-lan/examples/go/app.go diff --git a/labs/docker-lan/conf/drone/example/go.mod b/labs/docker-lan/examples/go/go.mod similarity index 100% rename from labs/docker-lan/conf/drone/example/go.mod rename to labs/docker-lan/examples/go/go.mod diff --git a/labs/docker-lan/conf/drone/example/main_test.go b/labs/docker-lan/examples/go/main_test.go similarity index 100% rename from labs/docker-lan/conf/drone/example/main_test.go rename to labs/docker-lan/examples/go/main_test.go