docker-compose fixes

docker/compose/bootstrap.Dockerfile

@@ -1,19 +1,6 @@
-ARG LOKINET_NETID=docker
-
-FROM alpine:edge as builder
-
-RUN apk update && \
-    apk add build-base cmake git libcap-dev libcap-static libuv-dev libuv-static curl ninja bash binutils-gold
-
-WORKDIR /src/
-COPY . /src/
-
-RUN make NINJA=ninja STATIC_LINK=ON BUILD_TYPE=Release
-
-FROM alpine:latest
+FROM compose-base:latest
 
 COPY ./docker/compose/bootstrap.ini /root/.lokinet/lokinet.ini
-COPY --from=builder /src/build/lokinet .
 
-CMD ["./lokinet"]
+CMD ["/lokinet"]
 EXPOSE 1090/udp 1190/tcp

docker/compose/compose-base.Dockerfile

@@ -0,0 +1,15 @@
+ARG LOKINET_NETID=docker
+
+FROM alpine:edge as builder
+
+RUN apk update && \
+    apk add build-base cmake git libcap-dev libcap-static libuv-dev libuv-static curl ninja bash binutils-gold
+
+WORKDIR /src/
+COPY . /src/
+
+RUN make NINJA=ninja STATIC_LINK=ON BUILD_TYPE=Release
+
+FROM alpine:latest
+
+COPY --from=builder /src/build/lokinet /

docker/compose/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.2'
+version: '3.4'
 services:
   bootstrap-router:
     build:
@@ -53,6 +53,8 @@ volumes:
 
 networks:
   testing_net:
+    driver: bridge
+    internal: true
     ipam:
       driver: default
       config:

docker/compose/router.Dockerfile

@@ -1,19 +1,6 @@
-ARG LOKINET_NETID=docker
-
-FROM alpine:edge as builder
-
-RUN apk update && \
-    apk add build-base cmake git libcap-dev libcap-static libuv-dev libuv-static curl ninja bash binutils-gold
-
-WORKDIR /src/
-COPY . /src/
-
-RUN make NINJA=ninja STATIC_LINK=ON BUILD_TYPE=Release
-
-FROM alpine:latest
+FROM compose-base:latest
 
 COPY ./docker/compose/router.ini /root/.lokinet/lokinet.ini
-COPY --from=builder /src/build/lokinet .
 
-CMD ["./lokinet"]
+CMD ["/lokinet"]
 EXPOSE 1090/udp 1190/tcp