From baed3fd8fd55cf8752f1486972723a74fcf20f98 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 4 Oct 2015 11:59:01 +0100 Subject: [PATCH 1/6] remove new user init, in baseimage --- init/10_new_user.sh | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 init/10_new_user.sh diff --git a/init/10_new_user.sh b/init/10_new_user.sh deleted file mode 100644 index 8e19aa9..0000000 --- a/init/10_new_user.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -if [ ! "$(id -u abc)" -eq "$PUID" ]; then usermod -o -u "$PUID" abc ; fi -if [ ! "$(id -g abc)" -eq "$PGID" ]; then groupmod -o -g "$PGID" abc ; fi -echo " ------------------------------------ -GID/UID ------------------------------------ -User uid: $(id -u abc) -User gid: $(id -g abc) ------------------------------------ -" \ No newline at end of file From 3ecbdf277329e573771a12ab1e27ff76e3ea43bd Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 4 Oct 2015 12:00:29 +0100 Subject: [PATCH 2/6] remove apt update init, in baseimage --- init/25_update_apt.sh | 4 ---- init/{20_update.sh => 30_update.sh} | 0 2 files changed, 4 deletions(-) delete mode 100644 init/25_update_apt.sh rename init/{20_update.sh => 30_update.sh} (100%) diff --git a/init/25_update_apt.sh b/init/25_update_apt.sh deleted file mode 100644 index 73ff990..0000000 --- a/init/25_update_apt.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -apt-get update -qq -apt-get --only-upgrade install -yqq ffmpeg diff --git a/init/20_update.sh b/init/30_update.sh similarity index 100% rename from init/20_update.sh rename to init/30_update.sh From 4f96dbe9e3dddd92f357d7ba61708052d8ec47bf Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 4 Oct 2015 12:04:52 +0100 Subject: [PATCH 3/6] shave a couple of layers --- Dockerfile | 9 ++------- init/40_check_config.sh | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index da907fd..5fa92fb 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,7 @@ FROM linuxserver/baseimage MAINTAINER smdion -ENV LC_ALL C.UTF-8 -ENV LANG en_US.UTF-8 - -# Use baseimage-docker's init system -CMD ["/sbin/my_init"] +ENV LC_ALL="C.UTF-8" LANG="en_US.UTF-8" # Install Dependencies RUN add-apt-repository ppa:mc3man/trusty-media && \ @@ -17,8 +13,7 @@ apt-get clean && rm -rf /var/lib/apt/lists/* /var/tmp/* ADD init/ /etc/my_init.d/ ADD services/ /etc/service/ ADD defaults/ /defaults -RUN chmod -v +x /etc/service/*/run -RUN chmod -v +x /etc/my_init.d/*.sh +RUN chmod -v +x /etc/service/*/run /etc/my_init.d/*.sh #Volumes and Ports EXPOSE 8181 diff --git a/init/40_check_config.sh b/init/40_check_config.sh index 028274e..bfa536c 100644 --- a/init/40_check_config.sh +++ b/init/40_check_config.sh @@ -1,7 +1,7 @@ #!/bin/bash -if [ ! -f /config/config.ini ]; then +if [ ! -f /config/config.ini ]; then /sbin/setuser abc cp -v /defaults/config.ini /config/config.ini fi From 289c7162eea5e426dbcbbe3e23aeec66d1bc65e7 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 4 Oct 2015 12:07:35 +0100 Subject: [PATCH 4/6] rebase to python baseimage --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5fa92fb..0ce1532 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM linuxserver/baseimage +FROM linuxserver/baseimage.python MAINTAINER smdion -ENV LC_ALL="C.UTF-8" LANG="en_US.UTF-8" +ENV LC_ALL="C.UTF-8" LANG="en_US.UTF-8" APTLIST="ffmpeg mc" # Install Dependencies RUN add-apt-repository ppa:mc3man/trusty-media && \ apt-get update && \ -apt-get install -qy git mc ffmpeg python wget && \ +apt-get install -qy $APTLIST && \ apt-get clean && rm -rf /var/lib/apt/lists/* /var/tmp/* #Adding Custom files From fe61af8e507064ae0b964ac7a5ca2918b5022353 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 4 Oct 2015 12:13:46 +0100 Subject: [PATCH 5/6] set python utf-8 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0ce1532..4e4a0d9 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM linuxserver/baseimage.python MAINTAINER smdion -ENV LC_ALL="C.UTF-8" LANG="en_US.UTF-8" APTLIST="ffmpeg mc" +ENV PYTHONIOENCODING="UTF-8" APTLIST="ffmpeg mc" # Install Dependencies RUN add-apt-repository ppa:mc3man/trusty-media && \ From b8405ab3d3655ec378022c2088d6ef3b776ea47d Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 4 Oct 2015 12:19:57 +0100 Subject: [PATCH 6/6] change http links to https in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 610be83..0dca17e 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![http://linuxserver.io](http://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png) -The [LinuxServer.io](http://linuxserver.io) team brings you another quality container release featuring auto-update on startup, easy user mapping and community support. Be sure to checkout our [forums](http://forum.linuxserver.io) or for real-time support our [IRC](http://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io`. +The [LinuxServer.io](https://linuxserver.io) team brings you another quality container release featuring auto-update on startup, easy user mapping and community support. Be sure to checkout our [forums](https://forum.linuxserver.io) or for real-time support our [IRC](https://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io`. # linuxserver/Headphones ![https://github.com/rembo10/headphones](http://i.imgur.com/5vSV3Gkl.png)