shimun/wireguard-user
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: shimun:master
Branches Tags
shimun:master
shimun:threadppol
shimun:new_events
shimun:rewrite
shimun:boringtun
shimun:structop
shimun:event_gen
shimun:event_gen_132
shimun:test
...
pull from: shimun:rewrite
Branches Tags
shimun:master
shimun:threadppol
shimun:new_events
shimun:rewrite
shimun:boringtun
shimun:structop
shimun:event_gen
shimun:event_gen_132
shimun:test

2 Commits
master ... rewrite

Author SHA1 Message Date
shimunn
f3717ce132 Streamlined Dockerfile [CI SKIP] 2019-04-03 01:42:23 +02:00
shimunn
aff9648e00 Streamlined Dockerfile 2019-04-03 01:42:05 +02:00
4 changed files with 19 additions and 13 deletions
Show Stats Expand all files Collapse all files

23
Dockerfile
View File

@ -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

5
Makefile
View File

@ -5,3 +5,8 @@ build:
push: build
docker push ${REPO}
pull:
docker pull ${REPO}
docker pull ${REPO}:build-event-gen
docker pull ${REPO}:build-boringtun

2
wg-event-gen/src/controller.rs
View File

@ -50,7 +50,7 @@ impl WireguardController for Userspace {
match key.as_ref() {
"" => {
//Empty line means end of data
build_peer(&mut peer, builder); //TODO: handle possible actual error case
build_peer(&mut peer, builder)?; //TODO: handle possible actual error case
}
"public_key" => {
add_key(&mut peer, parse_err(ECCKey::from_base64(value))?)?;

2
wg-event-gen/src/main.rs
View File

@ -72,7 +72,7 @@ fn main() -> io::Result<()> {
peers_last = Some(peers);
}
let pause = interval - now.elapsed();
dbg!(interval - pause);
//dbg!(interval - pause);
sleep(if pause > interval / 2 {
pause
} else {