From ade35fa0c9ff42a95bcff9a8cb9732d9ac3a2fce Mon Sep 17 00:00:00 2001 From: crocandr Date: Sat, 17 Mar 2018 10:02:31 +0100 Subject: [PATCH 1/9] OS changed to Debian --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6237651..b77893f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu +FROM debian RUN apt-get update && apt-get install -y minidlna vim From b36be8566d2707624eba3716a5f01651bc5c5dfe Mon Sep 17 00:00:00 2001 From: crocandr Date: Sat, 17 Mar 2018 10:02:45 +0100 Subject: [PATCH 2/9] Readme updated --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 31dc100..f7d764e 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ Not the best container, but works :) ## Build ``` -docker build -t sandras/minidlna . +docker build -t croc/minidlna . ``` ## Run ``` -docker run -tid --name=minidlna --net=host -e SRVNAME=dockerlna -e "FOLDERS=/mnt/data/mp3,/mnt/data/movie,/mnt/data/torrent" -v /mnt/data/pub/:/mnt/data sandras/minidlna /opt/start.sh +docker run -tid --name=minidlna --net=host -e SRVNAME=dockerlna -e "FOLDERS=/mnt/data/mp3,/mnt/data/movie,/mnt/data/torrent" -v /mnt/data/pub/:/mnt/data croc/minidlna /opt/start.sh ``` - `SRVNAME` - name of the minidlna From 67e9a75f001f80ece5a79ba9c0fe0952f7fd9595 Mon Sep 17 00:00:00 2001 From: crocandr Date: Sat, 17 Mar 2018 10:03:01 +0100 Subject: [PATCH 3/9] a sample docker-compose file added --- docker-compose.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..68e8c77 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3' + +services: + minidlna: + image: croc/minidlna + environment: + - SRVNAME=docker-minidlna + - FOLDERS=/mnt/data/mp3,/mnt/data/movie,/mnt/data/tv + volumes: + - '/mnt/data/pub:/mnt/data' + network_mode: 'host' + restart: always From aa71283ab50a0c6b4376eda3d57a764813ec007a Mon Sep 17 00:00:00 2001 From: crocandr Date: Sat, 17 Mar 2018 10:16:37 +0100 Subject: [PATCH 4/9] docker-compose file update with some examples --- docker-compose.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 68e8c77..5dd0bb5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,8 +5,11 @@ services: image: croc/minidlna environment: - SRVNAME=docker-minidlna - - FOLDERS=/mnt/data/mp3,/mnt/data/movie,/mnt/data/tv + - FOLDERS=/media/mp3,/media/movie,/media/tv_series volumes: - - '/mnt/data/pub:/mnt/data' + - '/mnt/data/pub/movies:/media/movies' + - '/mnt/data/pub/tv_series:/media/tv_series' + - '/mnt/data/pub/mp3:/media/mp3' +# - '/mnt/data/pub:/media/' network_mode: 'host' restart: always From b9be20ffbbaef8b592e11e3926c1beb80539555f Mon Sep 17 00:00:00 2001 From: crocandr Date: Sat, 17 Mar 2018 10:29:14 +0100 Subject: [PATCH 5/9] dlna port change function added --- docker-compose.yml | 9 +++++---- files/start.sh | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5dd0bb5..4411b15 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,11 +5,12 @@ services: image: croc/minidlna environment: - SRVNAME=docker-minidlna + - PORT=8200 - FOLDERS=/media/mp3,/media/movie,/media/tv_series - volumes: - - '/mnt/data/pub/movies:/media/movies' - - '/mnt/data/pub/tv_series:/media/tv_series' - - '/mnt/data/pub/mp3:/media/mp3' +# volumes: +# - '/mnt/data/pub/movies:/media/movies' +# - '/mnt/data/pub/tv_series:/media/tv_series' +# - '/mnt/data/pub/mp3:/media/mp3' # - '/mnt/data/pub:/media/' network_mode: 'host' restart: always diff --git a/files/start.sh b/files/start.sh index 634c086..d58df07 100644 --- a/files/start.sh +++ b/files/start.sh @@ -11,6 +11,9 @@ then echo "media_dir=$folder" >> /etc/minidlna.conf done + [ -z $PORT ] && { PORT=8200; } + echo "port $PORT" >> /etc/minidlna.conf + date > /etc/minidlna.configured fi From 55dc2d6809c2913daea6a10c7d6e94f6387d38f6 Mon Sep 17 00:00:00 2001 From: crocandr Date: Sat, 17 Mar 2018 10:35:27 +0100 Subject: [PATCH 6/9] dlna port change function fix --- files/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/start.sh b/files/start.sh index d58df07..cb96e14 100644 --- a/files/start.sh +++ b/files/start.sh @@ -12,7 +12,7 @@ then done [ -z $PORT ] && { PORT=8200; } - echo "port $PORT" >> /etc/minidlna.conf + sed -i "s@port.*00@port $PORT@g" /etc/minidlna.conf date > /etc/minidlna.configured fi From b91d4d7556fefb13c32c453545fad47faa54410d Mon Sep 17 00:00:00 2001 From: crocandr Date: Sat, 17 Mar 2018 10:51:24 +0100 Subject: [PATCH 7/9] port change fix --- Dockerfile | 2 +- files/start.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b77893f..b55acbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM debian -RUN apt-get update && apt-get install -y minidlna vim +RUN apt-get update && apt-get install -y minidlna vim net-tools COPY files/start.sh /opt/start.sh RUN chmod 755 /opt/start.sh diff --git a/files/start.sh b/files/start.sh index cb96e14..760218c 100644 --- a/files/start.sh +++ b/files/start.sh @@ -11,8 +11,8 @@ then echo "media_dir=$folder" >> /etc/minidlna.conf done - [ -z $PORT ] && { PORT=8200; } - sed -i "s@port.*00@port $PORT@g" /etc/minidlna.conf + [ -z $PORT ] && { PORT=8201; } + sed -i "s@port=.*00@port=$PORT@g" /etc/minidlna.conf date > /etc/minidlna.configured fi From 88f048668d8793d175fd9b5086dd2f33bc35b381 Mon Sep 17 00:00:00 2001 From: crocandr Date: Sat, 17 Mar 2018 10:51:52 +0100 Subject: [PATCH 8/9] docker-compose examples update --- docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4411b15..eba5532 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,12 +5,12 @@ services: image: croc/minidlna environment: - SRVNAME=docker-minidlna - - PORT=8200 + - PORT=8205 - FOLDERS=/media/mp3,/media/movie,/media/tv_series -# volumes: -# - '/mnt/data/pub/movies:/media/movies' -# - '/mnt/data/pub/tv_series:/media/tv_series' -# - '/mnt/data/pub/mp3:/media/mp3' + volumes: + - '/mnt/data/pub/movies:/media/movies' + - '/mnt/data/pub/tv_series:/media/tv_series' + - '/mnt/data/pub/mp3:/media/mp3' # - '/mnt/data/pub:/media/' network_mode: 'host' restart: always From 043e2db432444b6c9ec29baa7a72a05fd537110b Mon Sep 17 00:00:00 2001 From: crocandr Date: Sat, 17 Mar 2018 11:05:25 +0100 Subject: [PATCH 9/9] readme update --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index f7d764e..ffb5aca 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,6 @@ docker run -tid --name=minidlna --net=host -e SRVNAME=dockerlna -e "FOLDERS=/mnt - `SRVNAME` - name of the minidlna - `FOLDERS` - list of the shared folders in your volume (/mnt/data) +Please use docker-compose file (from my Github page) for easier management. + +