From aff9648e00d57105cf2d831201ddb76abef147df Mon Sep 17 00:00:00 2001
From: shimunn <>
Date: Wed, 3 Apr 2019 01:42:05 +0200
Subject: [PATCH] Streamlined Dockerfile

---
 Dockerfile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 01c8e6e..9c97fb2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,37 +2,36 @@ FROM rust:1.33-slim AS rustbuild
 
 FROM rustbuild AS eventbuild
 
+ARG MODE=--release
+
 WORKDIR /build
 
 RUN rustup target add x86_64-unknown-linux-musl
 
 COPY wg-event-gen/Cargo.* /build/
 
-RUN mkdir -p src && echo "fn main() {}" > src/main.rs && cargo build --release --target x86_64-unknown-linux-musl
+RUN mkdir -p src && echo "fn main() {}" > src/main.rs && cargo build $MODE --target x86_64-unknown-linux-musl
 
 COPY wg-event-gen/ /build
 
-RUN cargo build --target x86_64-unknown-linux-musl
+RUN cargo build --target x86_64-unknown-linux-musl $MODE
 
-FROM frolvlad/alpine-glibc AS test
-
-COPY --from=eventbuild /build/target/x86_64-unknown-linux-musl/debug/wg-event-gen /usr/bin/
-
-RUN echo "d41d8cd98f00b204e9800998ecf8427e  -" > test.md5 && wg-event-gen | md5sum -c test.md5
 
 FROM rustbuild AS boringbuild
 
+ARG MODE=--release
+
 WORKDIR /build
 
 RUN rustup target add x86_64-unknown-linux-musl
 
 COPY boringtun/Cargo.* /build/
 
-RUN mkdir -p src && echo "fn main() {}" > src/main.rs && touch src/lib.rs && cargo build --release #--target x86_64-unknown-linux-musl #Ring won't compile https://github.com/briansmith/ring/issues/713
+RUN mkdir -p src && echo "fn main() {}" > src/main.rs && touch src/lib.rs && cargo build $MODE #--target x86_64-unknown-linux-musl #Ring won't compile https://github.com/briansmith/ring/issues/713
 
 COPY boringtun/ /build
 
-RUN cargo build --release #--target x86_64-unknown-linux-musl
+RUN cargo build $MODE #--target x86_64-unknown-linux-musl
 
 
 FROM frolvlad/alpine-glibc
@@ -41,9 +40,11 @@ RUN echo http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories
 
 ENV WG_I_PREFER_BUGGY_USERSPACE_TO_POLISHED_KMOD=1
 
-COPY --from=eventbuild /build/target/x86_64-unknown-linux-musl/debug/wg-event-gen /usr/bin/
+ARG MODE=--release
 
-COPY --from=boringbuild /build/target/release/boringtun /usr/bin/
+COPY --from=eventbuild /build/target/x86_64-unknown-linux-musl/*/wg-event-gen /usr/bin/
+
+COPY --from=boringbuild /build/target/*/boringtun /usr/bin/
 
 COPY init.sh /init.sh