diff --git a/murmur/README.md b/murmur/README.md new file mode 100644 index 0000000..05d8cc6 --- /dev/null +++ b/murmur/README.md @@ -0,0 +1,29 @@ +murmur +====== + +## docker-compose.yml + +```yaml +murmur: + image: vimagick/murmur + ports: + - "64738:64738/tcp" + - "64738:64738/udp" + restart: always +``` + +## Server Setup + +```bash +$ docker-compose up -d +$ docker-compose logs +``` + +> Superuser password was generated at startup. + +## Client Setup + +- Android: +- IOS: +- Windows: +- MacOSX: diff --git a/node-red/arm/docker-compose.yml b/node-red/arm/docker-compose.yml index a6c5c31..7cec8cb 100644 --- a/node-red/arm/docker-compose.yml +++ b/node-red/arm/docker-compose.yml @@ -1,5 +1,5 @@ node-red: - image: vimagick/node-red-arm + image: easypi/node-red-arm ports: - "1880:1880" volumes: diff --git a/pptp/Dockerfile b/pptp/Dockerfile index 01f5369..487f96c 100644 --- a/pptp/Dockerfile +++ b/pptp/Dockerfile @@ -2,13 +2,12 @@ # Dockerfile for pptp # -FROM debian +FROM alpine:edge MAINTAINER kev -RUN set -xe \ - && apt-get update \ - && apt-get install -y iptables pptp-linux \ - && rm -rf /var/lib/apt/lists/* +RUN apk add --no-cache \ + --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \ + pptpclient COPY docker-entrypoint.sh /entrypoint.sh diff --git a/pptp/Dockerfile.debian b/pptp/Dockerfile.debian new file mode 100644 index 0000000..1133c77 --- /dev/null +++ b/pptp/Dockerfile.debian @@ -0,0 +1,15 @@ +# +# Dockerfile for pptp +# + +FROM debian +MAINTAINER kev + +RUN set -xe \ + && apt-get update \ + && apt-get install -y pptp-linux \ + && rm -rf /var/lib/apt/lists/* + +COPY docker-entrypoint.sh /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/pptp/arm/Dockerfile b/pptp/arm/Dockerfile new file mode 100644 index 0000000..382712d --- /dev/null +++ b/pptp/arm/Dockerfile @@ -0,0 +1,14 @@ +# +# Dockerfile for pptp-arm +# + +FROM easypi/alpine-arm:edge +MAINTAINER EasyPi Software Foundation + +RUN apk add --no-cache \ + --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \ + pptpclient + +COPY docker-entrypoint.sh /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/pptp/arm/docker-compose.yml b/pptp/arm/docker-compose.yml new file mode 100644 index 0000000..90d3b4d --- /dev/null +++ b/pptp/arm/docker-compose.yml @@ -0,0 +1,10 @@ +pptp: + image: easypi/pptp-arm + environment: + - SERVER=192.168.31.222 + - TUNNEL=vps + - USERNAME=username + - PASSWORD=password + net: host + privileged: yes + restart: unless-stopped diff --git a/pptp/arm/docker-entrypoint.sh b/pptp/arm/docker-entrypoint.sh new file mode 100755 index 0000000..dcff73c --- /dev/null +++ b/pptp/arm/docker-entrypoint.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +cat > /etc/ppp/peers/${TUNNEL} <<_EOF_ +pty "pptp ${SERVER} --nolaunchpppd" +name "${USERNAME}" +password "${PASSWORD}" +remotename PPTP +require-mppe-128 +file /etc/ppp/options.pptp +ipparam "${TUNNEL}" +_EOF_ + +cat > /etc/ppp/ip-up <<"_EOF_" +#!/bin/sh +ip route add 0.0.0.0/1 dev $1 +ip route add 128.0.0.0/1 dev $1 +_EOF_ + +cat > /etc/ppp/ip-down <<"_EOF_" +#!/bin/sh +ip route del 0.0.0.0/1 dev $1 +ip route del 128.0.0.0/1 dev $1 +_EOF_ + +exec pon ${TUNNEL} debug dump logfd 2 nodetach persist "$@" diff --git a/pptp/docker-entrypoint.sh b/pptp/docker-entrypoint.sh index 153e9cc..dcff73c 100755 --- a/pptp/docker-entrypoint.sh +++ b/pptp/docker-entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh cat > /etc/ppp/peers/${TUNNEL} <<_EOF_ pty "pptp ${SERVER} --nolaunchpppd" @@ -10,19 +10,16 @@ file /etc/ppp/options.pptp ipparam "${TUNNEL}" _EOF_ -cat > /etc/ppp/ip-up.d/9999routes <<_EOF_ -#!/bin/bash -ip route add 0.0.0.0/1 dev \$1 -ip route add 128.0.0.0/1 dev \$1 +cat > /etc/ppp/ip-up <<"_EOF_" +#!/bin/sh +ip route add 0.0.0.0/1 dev $1 +ip route add 128.0.0.0/1 dev $1 _EOF_ -cat > /etc/ppp/ip-down.d/9999routes <<_EOF_ -#!/bin/bash -ip route del 0.0.0.0/1 dev \$1 -ip route del 128.0.0.0/1 dev \$1 +cat > /etc/ppp/ip-down <<"_EOF_" +#!/bin/sh +ip route del 0.0.0.0/1 dev $1 +ip route del 128.0.0.0/1 dev $1 _EOF_ -chmod +x /etc/ppp/ip-up.d/9999routes -chmod +x /etc/ppp/ip-down.d/9999routes - exec pon ${TUNNEL} debug dump logfd 2 nodetach persist "$@" diff --git a/rtmp/README.md b/rtmp/README.md index a8ef77d..ed257e5 100644 --- a/rtmp/README.md +++ b/rtmp/README.md @@ -29,7 +29,7 @@ client: image: easypi/rtmp-client-arm # command: # - ffmpeg -i $$RTMP_DEV -video_size 800x600 -vf "hflip,vflip" -f flv $$RTMP_URI -# - ffmpeg -f alsa -i default -i $$RTMP_DEV -c:a aac -c:v libx264 -f flv $$RTMP_URI +# - ffmpeg -f alsa -ac 1 -ar 22050 -i hw:1 -i $$RTMP_DEV -c:a aac -c:v flv1 -f flv $$RTMP_URI devices: # - /dev/snd - /dev/video0 @@ -94,10 +94,17 @@ URL: rtmp://192.168.31.254/live/ Streaming key: webcam ``` +## Player Setup + +- vlc +- ffplay +- [online](https://www.hlsplayer.net/rtmp-player) + ## References - https://github.com/arut/nginx-rtmp-module/wiki/Directives - https://trac.ffmpeg.org/wiki/StreamingGuide - https://trac.ffmpeg.org/wiki/Capture/Webcam +- https://trac.ffmpeg.org/wiki/Capture/ALSA - https://trac.ffmpeg.org/wiki/EncodingForStreamingSites - http://apk-dl.com/vlc-for-android/org.videolan.vlc/