update

Former-commit-id: f4292787c719c2a18721262865f1e1fb3cdda907
Former-commit-id: 8420d738d3c8539bd5d871736f878bca0b214bde

labs/docker-lan/docker-compose.yml

@@ -98,24 +98,24 @@ services:
             - ${DOCKER_SOCK}:/var/run/docker.sock
         depends_on:
             - drone
-    # dnsmasq:
+    dnsmasq:
-    #     image: jpillora/dnsmasq:1.1.0
+        image: jpillora/dnsmasq:1.1.0
-    #     restart: always
+        restart: always
-    #     cap_add:
+        cap_add:
-    #         - NET_ADMIN
+            - NET_ADMIN
-    #     ports:
+        ports:
-    #         - 53:53/udp
+            - 53:53/udp
-    #         - 10000:8080
+            - 10000:8080
-    #     volumes:
+        volumes:
-    #         - ./conf/dnsmasq/dnsmasq.conf:/etc/dnsmasq.conf
+            - ./conf/dnsmasq/dnsmasq.conf:/etc/dnsmasq.conf
-    # nginx:
+    nginx:
-    #     image: nginx:1.20.0
+        image: nginx:1.20.0
-    #     restart: always
+        restart: always
-    #     environment:
+        environment:
-    #         TZ: "Asia/Shanghai"
+            TZ: "Asia/Shanghai"
-    #     ports:
+        ports:
-    #         - 80:80
+            - 80:80
-    #         - 443:443
+            - 443:443
-    #     volumes:
+        volumes:
-    #         - ./conf/nginx/conf.d:/etc/nginx/conf.d
+            - ./conf/nginx/conf.d:/etc/nginx/conf.d
-    #         - ./log/nginx:/var/log/nginx
+            - ./log/nginx:/var/log/nginx