Merge pull request #3 from sparklyballs/master

change to python baseimage
This commit is contained in:
Stian Buch Larsen 2015-10-06 09:08:39 +02:00
commit 3f18b44c66
6 changed files with 6 additions and 27 deletions

View file

@ -1,24 +1,19 @@
FROM linuxserver/baseimage
FROM linuxserver/baseimage.python
MAINTAINER smdion <me@seandion.com>
ENV LC_ALL C.UTF-8
ENV LANG en_US.UTF-8
# Use baseimage-docker's init system
CMD ["/sbin/my_init"]
ENV PYTHONIOENCODING="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
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

View file

@ -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)

View file

@ -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)
-----------------------------------
"

View file

@ -1,4 +0,0 @@
#!/bin/bash
apt-get update -qq
apt-get --only-upgrade install -yqq ffmpeg

View file

@ -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