From 7875e203e070b6320c9b069a946fcb989fdb98a5 Mon Sep 17 00:00:00 2001 From: mantaohuang Date: Sat, 30 May 2020 01:06:22 -0400 Subject: [PATCH] working docker --- docker/.gitignore | 1 + docker/Dockerfile | 2 +- docker/docker-compose.yml | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/.gitignore b/docker/.gitignore index 2ec5195..29ea3ea 100644 --- a/docker/.gitignore +++ b/docker/.gitignore @@ -1 +1,2 @@ +.env config/ \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 76da7c4..796d252 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,7 +16,7 @@ RUN pip install -r docker_requirement.txt FROM alpine:latest RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && \ - apk --no-cache add openvpn iptables ip6tables bash python3 shadow neovim 3proxy + apk --no-cache add openvpn iptables ip6tables bash python3 shadow neovim 3proxy fping COPY --from=python-builder /mop /mop COPY --from=go-builder /ovpn-lb-socks5/go-socks-lb/go-socks-lb /mop/go-socks-lb CMD /mop/docker-entrypoint.sh diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index b6e6b2e..d463748 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -5,9 +5,8 @@ services: build: . container_name: ovpn_lb_test ports: - - 127.0.0.1:8000:8000 - - 127.0.0.1:7000:7000 - - 127.0.0.1:7001:7001 + - "${bind_ip}:8000:8000" + - "${bind_ip}:7000-7001:7000-7001" volumes: - /dev/net:/dev/net:z - ./config:/config