From 4f96dbe9e3dddd92f357d7ba61708052d8ec47bf Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 4 Oct 2015 12:04:52 +0100 Subject: [PATCH] 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