docker-tests: speed up tests, combine client and server into one image

tonarino · Sep 15, 2021 · 4265a1f · 4265a1f
1 parent 74eda56
commit 4265a1f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 53 deletions.
diff --git a/docker-tests/Dockerfile.innernet b/docker-tests/Dockerfile.innernet
@@ -7,8 +7,8 @@ RUN apt-get update && \
 WORKDIR /app
 
 COPY . .
-RUN cargo build --release --bin innernet
-RUN strip /app/target/release/innernet
+RUN cargo build
+RUN strip /app/target/debug/innernet /app/target/debug/innernet-server
 
 FROM golang:latest as wireguard
 ARG wg_go_tag=0.0.20210323
@@ -39,7 +39,9 @@ RUN apt-get update && \
 WORKDIR /app
 
 COPY ./docker-tests/start-client.sh ./
+COPY ./docker-tests/start-server.sh ./
 COPY --from=wireguard /usr/bin/wireguard-go /usr/bin/wg* /usr/bin/
-COPY --from=builder /app/target/release/innernet /usr/bin/
+COPY --from=builder /app/target/debug/innernet /usr/bin/
+COPY --from=builder /app/target/debug/innernet-server /usr/bin/
 
-CMD ["/app/start-client.sh"]
+CMD ["/app/start-server.sh"]
diff --git a/docker-tests/Dockerfile.innernet-server b/docker-tests/Dockerfile.innernet-server
diff --git a/docker-tests/build-docker-images.sh b/docker-tests/build-docker-images.sh
@@ -4,5 +4,4 @@ set -ex
 SELF_DIR="$(dirname "$0")"
 cd "$SELF_DIR/.."
 
-docker build -t innernet-server -f "$SELF_DIR/Dockerfile.innernet-server" .
 docker build -t innernet -f "$SELF_DIR/Dockerfile.innernet" .
diff --git a/docker-tests/run-docker-tests.sh b/docker-tests/run-docker-tests.sh
@@ -55,7 +55,7 @@ SERVER_CONTAINER=$(cmd docker create -it --rm \
     --env RUST_LOG=debug \
     --env INNERNET_ARGS="$INNERNET_ARGS" \
     --cap-add NET_ADMIN \
-    innernet-server)
+    innernet)
 cmd docker start -a "$SERVER_CONTAINER" &
 
 info "server started as $SERVER_CONTAINER"
@@ -71,7 +71,7 @@ PEER1_CONTAINER=$(cmd docker create --rm -it \
     --env INTERFACE=evilcorp \
     --env INNERNET_ARGS="$INNERNET_ARGS" \
     --cap-add NET_ADMIN \
-    innernet)
+    innernet /app/start-client.sh)
 info "peer1 started as $PEER1_CONTAINER"
 cmd docker cp "$tmp_dir/peer1.toml" "$PEER1_CONTAINER:/app/invite.toml"
 cmd docker start "$PEER1_CONTAINER"
@@ -111,7 +111,7 @@ PEER2_CONTAINER=$(docker create --rm -it \
     --cap-add NET_ADMIN \
     --env INTERFACE=evilcorp \
     --env INNERNET_ARGS="$INNERNET_ARGS" \
-    innernet)
+    innernet /app/start-client.sh)
 info "peer2 started as $PEER2_CONTAINER"
 cmd docker cp "$tmp_dir/peer2.toml" "$PEER2_CONTAINER:/app/invite.toml"
 cmd docker start "$PEER2_CONTAINER"