diff --git a/Dockerfile b/Dockerfile index 699a269e25dfe54993fda14a9f7cbdb2339b1dee..3e6d85eac82d941d827e1b58ecb74833fb1506db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,6 @@ RUN apt-get -q update \ ENV GOPATH=/go WORKDIR $GOPATH -RUN git clone https://github.com/OperatorFoundation/shapeshifter-dispatcher /shapeshifter-dispatcher && cd /shapeshifter-dispatcher && git reset --hard 34bd4b3fe24537a8a7a827825a1a19f2ad13adae && /usr/lib/go-1.19/bin/go build -RUN strip /shapeshifter-dispatcher/shapeshifter-dispatcher FROM registry.git.autistici.org/ai3/docker/s6-base @@ -36,8 +34,6 @@ RUN apt-get -q update \ # Remove unwanted prometheus-node-exporter scripts installed by the package RUN rm -f /var/lib/prometheus-node-exporter/* -COPY --from=build /shapeshifter-dispatcher/shapeshifter-dispatcher /usr/local/bin/shapeshifter-dispatcher - RUN setcap cap_net_admin,cap_net_bind_service+ep /usr/sbin/openvpn RUN setcap cap_net_admin+ep /bin/ip RUN setcap cap_net_bind_service+ep /usr/sbin/kresd diff --git a/README.md b/README.md deleted file mode 100644 index da84d4bab5a36a58686e1b489e628d99c17f2a18..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,13 +0,0 @@ -Running a shapeshifter-dispatcher container in float ---- - -Chaperone, a small init, is used to launch shapeshifter dispatcher. It needs to have some variables: - -* RHOST: where traffic should go to, like the IP of where your OpenVPN server - listens on. If it's on the same host 127.0.0.1 would do. -* RPORT: associated port of that OpenVPN server, 1194 by default -* LHOST: listen on this IP -* OBFSPORT: your obfs4-exposed port -* LOGLEVEL: ERROR/WARN/INFO/DEBUG -* EXTORPORT: Specify the address of a server implementing the Extended OR Port protocol, which is used for per-connection metadata - diff --git a/conf/services.d/shapeshifter-dispatcher/finish b/conf/services.d/shapeshifter-dispatcher/finish deleted file mode 100755 index 08c1d8228c2399d08d6930cd680a055926300f4e..0000000000000000000000000000000000000000 --- a/conf/services.d/shapeshifter-dispatcher/finish +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -echo "Exiting shapeshifter-dispatcher" -s6-svscanctl -t /var/run/s6/services diff --git a/conf/services.d/shapeshifter-dispatcher/run b/conf/services.d/shapeshifter-dispatcher/run deleted file mode 100755 index 45e5088ce5a9a5569908d918197515a0ec7d8772..0000000000000000000000000000000000000000 --- a/conf/services.d/shapeshifter-dispatcher/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -echo "Starting shapeshifter-dispatcher" -exec /usr/local/bin/shapeshifter-dispatcher -transparent -server -state /srv/leap/shapeshifter-state -orport ${RHOST}:${RPORT} -transport obfs4 -bindhost ${LHOST} -bindport ${OBFSPORT} -extorport ${RHOST}:${EXTORPORT} -logLevel ${LOGLEVEL}