From 44e44820c0a5556c64d21e8829dbfffffd0fbb50 Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Fri, 22 Nov 2019 14:09:24 +0100
Subject: Add a Dockerfile to run this webapp

Made to be easy to run from float
---
 Dockerfile | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..0fa5c10
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,18 @@
+FROM debian:buster AS build
+RUN apt-get -q update && env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    build-essential pkg-config golang-go git ca-certificates openvpn \
+    && rm -rf /var/lib/apt/lists/*
+
+# don't need to do bash tricks to keep the layers small, as this is a multi-stage build
+ENV GOPATH=/go
+WORKDIR $GOPATH
+RUN go get -u 0xacab.org/leap/vpnweb
+RUN strip $GOPATH/leap/vpnweb
+
+FROM registry.git.autistici.org/ai3/docker/chaperone-base
+
+COPY --from=build /go/bin/vpnweb /usr/local/bin/vpnweb
+COPY chaperone.d/ /etc/chaperone.d
+
+ENTRYPOINT ["/usr/local/bin/chaperone"]
+
-- 
cgit v1.2.3


From 3929de54343df9ffa6044900dd5a7e27b664fe63 Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Fri, 22 Nov 2019 14:49:58 +0100
Subject: add .gitlab-ci.yml

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..a9385ad
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,3 @@
+---
+include:
+  - 'https://0xacab.org/leap/container-platform/glue/raw/master/.gitlab-ci.yml'
-- 
cgit v1.2.3


From 10f825d96704ecac589f97aeba1de3dd116efb3a Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Fri, 22 Nov 2019 14:51:12 +0100
Subject: Add chaperone.de directory

---
 Dockerfile              | 2 +-
 chaperone.d/vpnweb.conf | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 chaperone.d/vpnweb.conf

diff --git a/Dockerfile b/Dockerfile
index 0fa5c10..b867132 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get -q update && env DEBIAN_FRONTEND=noninteractive apt-get install -y -
 ENV GOPATH=/go
 WORKDIR $GOPATH
 RUN go get -u 0xacab.org/leap/vpnweb
-RUN strip $GOPATH/leap/vpnweb
+RUN strip $GOPATH/bin/vpnweb
 
 FROM registry.git.autistici.org/ai3/docker/chaperone-base
 
diff --git a/chaperone.d/vpnweb.conf b/chaperone.d/vpnweb.conf
new file mode 100644
index 0000000..1c10f09
--- /dev/null
+++ b/chaperone.d/vpnweb.conf
@@ -0,0 +1,4 @@
+vpnweb-server.service: {
+     command: "/bin/sh -c 'exec /usr/local/bin/vpnweb -caCrt ${CLIENT_CA.CRT:-/etc/leap/ca/client_ca.crt} -caKey ${CLIENT_CA.KEY:-/etc/leap/ca/client_ca.key} -notls }'",
+     exit_kills: false
+}
-- 
cgit v1.2.3