Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed unneeded workarounds #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# Ubuntu has a more recent, less buggy MPD. You still can use Debian if you want to. This dockerfile is compatible with both.
FROM ubuntu
#FROM debian:jessie

MAINTAINER Natenom <[email protected]>
EXPOSE 7701
Expand All @@ -14,9 +12,6 @@ ENV MUMBLE_PASSWORD="supersecretpassword"
ENV MUMBLE_CHANNEL="Bottest"
ENV MUMBLE_BITRATE="72000"

# We need extra repositories for lib-av
RUN echo "deb http://httpredir.debian.org/debian jessie main contrib non-free" >> /etc/apt/sources.list.d/nonfree.list

RUN DEBIAN_FRONTEND=noninteractive apt-get update;\
apt-get --allow-unauthenticated --no-install-recommends -qy install curl libyaml-dev git libopus-dev \
build-essential zlib1g zlib1g-dev libssl-dev mpd mpc tmux \
Expand All @@ -25,18 +20,13 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update;\
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

# Fix for ubuntu...
RUN test -f /usr/bin/ffmpeg || ln -s /usr/bin/avconv /usr/bin/ffmpeg

RUN adduser --quiet --disabled-password --uid 1000 --home /home/botmaster --shell /bin/bash botmaster

USER botmaster
WORKDIR /home/botmaster/

RUN mkdir ~/src
RUN mkdir ~/logs
#RUN mkdir ~/src/certs
#RUN mkdir ~/music
RUN mkdir ~/temp
RUN mkdir -p ~/mpd1/playlists
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
Expand Down