update

Former-commit-id: eb238982f985c5941ede79430fb1eae564daf7fb
Former-commit-id: ca663aac152c60c5e24cca36d247c1c9d986c6d9

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:
+    # netdata:
-        image: netdata/netdata:v1.30.0
+    #     image: netdata/netdata:v1.30.0
-        restart: always
+    #     restart: always
-        ports:
+    #     ports:
-            - 19999:19999
+    #         - 19999:19999
-        cap_add:
+    #     cap_add:
-            - SYS_PTRACE
+    #         - SYS_PTRACE
-        security_opt:
+    #     security_opt:
-            - apparmor:unconfined
+    #         - apparmor:unconfined
-        volumes:
+    #     volumes:
-            - /etc/passwd:/host/etc/passwd:ro
+    #         - /etc/passwd:/host/etc/passwd:ro
-            - /etc/group:/host/etc/group:ro
+    #         - /etc/group:/host/etc/group:ro
-            - /proc:/host/proc:ro
+    #         - /proc:/host/proc:ro
-            - /sys:/host/sys:ro
+    #         - /sys:/host/sys:ro
-            - /etc/os-release:/host/etc/os-release: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:
+            - registry
-        image: jpillora/dnsmasq:1.1.0
+    # dnsmasq:
-        restart: always
+    #     image: jpillora/dnsmasq:1.1.0
-        cap_add:
+    #     restart: always
-            - NET_ADMIN
+    #     cap_add:
-        ports:
+    #         - NET_ADMIN
-            - 53:53/udp
+    #     ports:
-            - 10000:8080
+    #         - 53:53/udp
-        volumes:
+    #         - 10000:8080
-            - ./conf/dnsmasq/dnsmasq.conf:/etc/dnsmasq.conf
+    #     volumes:
-    nginx:
+    #         - ./conf/dnsmasq/dnsmasq.conf:/etc/dnsmasq.conf
-        image: nginx:1.20.0
+    # nginx:
-        restart: always
+    #     image: nginx:1.20.0
-        environment:
+    #     restart: always
-            TZ: "Asia/Shanghai"
+    #     environment:
-        ports:
+    #         TZ: "Asia/Shanghai"
-            - 80:80
+    #     ports:
-            - 443:443
+    #         - 80:80
-        volumes:
+    #         - 443:443
-            - ./conf/nginx/conf.d:/etc/nginx/conf.d
+    #     volumes:
-            - ./log/nginx:/var/log/nginx
+    #         - ./conf/nginx/conf.d:/etc/nginx/conf.d
+    #         - ./log/nginx:/var/log/nginx