From f3717ce13276311a63065b86ba83855bb83fd9d0 Mon Sep 17 00:00:00 2001 From: shimunn <> Date: Wed, 3 Apr 2019 01:42:23 +0200 Subject: [PATCH] Streamlined Dockerfile [CI SKIP] --- Makefile | 5 +++++ wg-event-gen/src/controller.rs | 2 +- wg-event-gen/src/main.rs | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 76ddbfd..ae5e49d 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/wg-event-gen/src/controller.rs b/wg-event-gen/src/controller.rs index fdb6d88..31c16a1 100644 --- a/wg-event-gen/src/controller.rs +++ b/wg-event-gen/src/controller.rs @@ -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))?)?; diff --git a/wg-event-gen/src/main.rs b/wg-event-gen/src/main.rs index 4712636..5962001 100644 --- a/wg-event-gen/src/main.rs +++ b/wg-event-gen/src/main.rs @@ -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 {