diff --git a/dante/Dockerfile b/dante/Dockerfile index 98ecdac..85e096a 100644 --- a/dante/Dockerfile +++ b/dante/Dockerfile @@ -1,17 +1,17 @@ # -# Dockerfile for dante-server +# Dockerfile for dante # -FROM debian:jessie -MAINTAINER kev +FROM debian:buster +MAINTAINER EasyPi Software Foundation -ENV DANTE_VER 1.4.2 -ENV DANTE_URL https://www.inet.no/dante/files/dante-$DANTE_VER.tar.gz -ENV DANTE_SHA 4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7 -ENV DANTE_FILE dante.tar.gz -ENV DANTE_TEMP dante -ENV DANTE_DEPS build-essential curl +ENV DANTE_VER=1.4.2 +ENV DANTE_URL=https://www.inet.no/dante/files/dante-$DANTE_VER.tar.gz +ENV DANTE_SHA=4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7 +ENV DANTE_FILE=dante.tar.gz +ENV DANTE_TEMP=dante +ENV DANTE_DEPS="build-essential curl" RUN set -xe \ && apt-get update \ @@ -28,13 +28,12 @@ RUN set -xe \ && apt-get purge -y --auto-remove $DANTE_DEPS \ && rm -rf /var/lib/apt/lists/* -ADD sockd.conf /etc/sockd.conf +COPY data/sockd.conf /etc/dante/sockd.conf -ENV CFGFILE /etc/sockd.conf -ENV PIDFILE /tmp/sockd.pid -ENV WORKERS 10 +ENV CFGFILE=/etc/dante/sockd.conf +ENV PIDFILE=/run/sockd.pid +ENV WORKERS=10 EXPOSE 1080 CMD sockd -f $CFGFILE -p $PIDFILE -N $WORKERS - diff --git a/dante/README.md b/dante/README.md index 24a8c93..960ccf4 100644 --- a/dante/README.md +++ b/dante/README.md @@ -8,14 +8,18 @@ network connectivity. ## docker-compose.yml -``` -dante: - image: vimagick/dante - ports: - - "1080:1080" - volumes: - - ./sockd.conf:/etc/sockd.conf - restart: always +```yaml +version: "3.8" +services: + dante: + image: vimagick/dante + ports: + - "1080:1080" + volumes: + - ./data:/etc/dante + tmpfs: + - /run + restart: unless-stopped ``` ## sockd.conf @@ -44,7 +48,7 @@ socks pass { ## up and running -``` +```bash $ docker-compose up -d # To enable username authentication, please uncomment `socksmethod: username`. diff --git a/dante/sockd.conf b/dante/data/sockd.conf similarity index 100% rename from dante/sockd.conf rename to dante/data/sockd.conf diff --git a/dante/docker-compose.yml b/dante/docker-compose.yml index 1c15dca..5ceb8b0 100644 --- a/dante/docker-compose.yml +++ b/dante/docker-compose.yml @@ -1,7 +1,11 @@ -dante: - image: vimagick/dante - ports: - - "1080:1080" - volumes: - - ./sockd.conf:/etc/sockd.conf - restart: always +version: "3.8" +services: + dante: + image: vimagick/dante + ports: + - "1080:1080" + volumes: + - ./data:/etc/dante + tmpfs: + - /run + restart: unless-stopped diff --git a/n8n/arm/docker-compose.yml b/n8n/arm/docker-compose.yml index 063f082..94d4fcd 100644 --- a/n8n/arm/docker-compose.yml +++ b/n8n/arm/docker-compose.yml @@ -1,9 +1,9 @@ version: "3.8" services: n8n: - image: n8nio/n8n:latest-rpi + image: n8nio/n8n:0.90.0-rpi ports: - "5678:5678" volumes: - - ./data:/root/.n8n + - ./data:/home/node/.n8n restart: unless-stopped