Attempting to get docker setup properly; Notifications colour consistency
This commit is contained in:
42
Dockerfile
42
Dockerfile
@ -1,42 +1,34 @@
|
||||
FROM debian:stretch-slim
|
||||
|
||||
# Copy the current codebase
|
||||
COPY . /iris
|
||||
|
||||
RUN set -ex \
|
||||
# Official Mopidy install for Debian/Ubuntu along with some extensions
|
||||
# (see https://docs.mopidy.com/en/latest/installation/debian/ )
|
||||
&& apt-get update \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||
curl \
|
||||
dumb-init \
|
||||
gcc \
|
||||
gnupg \
|
||||
gstreamer1.0-alsa \
|
||||
gstreamer1.0-plugins-bad \
|
||||
python-crypto \
|
||||
curl \
|
||||
dumb-init \
|
||||
gcc \
|
||||
gnupg \
|
||||
gstreamer1.0-alsa \
|
||||
gstreamer1.0-plugins-bad \
|
||||
python-crypto \
|
||||
python-pykka \
|
||||
&& curl -L https://apt.mopidy.com/mopidy.gpg | apt-key add - \
|
||||
&& curl -L https://apt.mopidy.com/mopidy.list -o /etc/apt/sources.list.d/mopidy.list \
|
||||
&& apt-get update \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||
mopidy \
|
||||
mopidy-soundcloud \
|
||||
mopidy-spotify \
|
||||
mopidy \
|
||||
mopidy-soundcloud \
|
||||
mopidy-spotify \
|
||||
&& curl -L https://bootstrap.pypa.io/get-pip.py | python - \
|
||||
&& pip install -U six pyasn1 requests[security] cryptography \
|
||||
&& pip install \
|
||||
Mopidy-Local-Images \
|
||||
Mopidy-Local-SQLite \
|
||||
Mopidy-GMusic \
|
||||
pyopenssl \
|
||||
youtube-dl \
|
||||
# Clone Iris from current directory and install in development mode.
|
||||
# This allows a binding at "/iris" to map to your local folder for development.
|
||||
&& cd /iris \
|
||||
&& python setup.py develop \
|
||||
&& cd / \
|
||||
&& mkdir -p /var/lib/mopidy/.config \
|
||||
&& ln -s /config /var/lib/mopidy/.config/mopidy \
|
||||
Mopidy-Local-Images \
|
||||
Mopidy-Local-SQLite \
|
||||
Mopidy-GMusic \
|
||||
pyopenssl \
|
||||
youtube-dl \
|
||||
mopidy-iris \
|
||||
# Install Snapcast
|
||||
# This is the most reliable way to get audio out of a Docker instance.
|
||||
&& curl -L https://github.com/badaix/snapcast/releases/download/v0.15.0/snapserver_0.15.0_amd64.deb -o snapserver.deb \
|
||||
|
||||
79
Dockerfile-develop
Normal file
79
Dockerfile-develop
Normal file
@ -0,0 +1,79 @@
|
||||
FROM debian:stretch-slim
|
||||
|
||||
# Copy the current codebase
|
||||
COPY . /iris
|
||||
|
||||
RUN set -ex \
|
||||
# Official Mopidy install for Debian/Ubuntu along with some extensions
|
||||
# (see https://docs.mopidy.com/en/latest/installation/debian/ )
|
||||
&& apt-get update \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||
curl \
|
||||
dumb-init \
|
||||
gcc \
|
||||
gnupg \
|
||||
gstreamer1.0-alsa \
|
||||
gstreamer1.0-plugins-bad \
|
||||
python-crypto \
|
||||
python-pykka \
|
||||
&& curl -L https://apt.mopidy.com/mopidy.gpg | apt-key add - \
|
||||
&& curl -L https://apt.mopidy.com/mopidy.list -o /etc/apt/sources.list.d/mopidy.list \
|
||||
&& apt-get update \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||
mopidy \
|
||||
mopidy-soundcloud \
|
||||
mopidy-spotify \
|
||||
&& curl -L https://bootstrap.pypa.io/get-pip.py | python - \
|
||||
&& pip install -U six pyasn1 requests[security] cryptography \
|
||||
&& pip install \
|
||||
Mopidy-Local-Images \
|
||||
Mopidy-Local-SQLite \
|
||||
Mopidy-GMusic \
|
||||
pyopenssl \
|
||||
youtube-dl \
|
||||
# Clone Iris from current directory and install in development mode.
|
||||
# This allows a binding at "/iris" to map to your local folder for development.
|
||||
&& cd /iris \
|
||||
&& python setup.py develop \
|
||||
&& cd / \
|
||||
&& mkdir -p /var/lib/mopidy/.config \
|
||||
&& ln -s /config /var/lib/mopidy/.config/mopidy \
|
||||
# Install Snapcast
|
||||
# This is the most reliable way to get audio out of a Docker instance.
|
||||
&& curl -L https://github.com/badaix/snapcast/releases/download/v0.15.0/snapserver_0.15.0_amd64.deb -o snapserver.deb \
|
||||
&& dpkg -i snapserver.deb \
|
||||
&& touch /etc/default/snapserver \
|
||||
&& apt-get -f install \
|
||||
# Clean-up
|
||||
&& apt-get purge --auto-remove -y \
|
||||
curl \
|
||||
gcc \
|
||||
git \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache
|
||||
|
||||
# Start helper script.
|
||||
COPY docker/entrypoint.sh /entrypoint.sh
|
||||
|
||||
# Default configuration.
|
||||
COPY docker/mopidy.conf /config/mopidy.conf
|
||||
|
||||
# Copy the pulse-client configuratrion.
|
||||
COPY docker/pulse-client.conf /etc/pulse/client.conf
|
||||
|
||||
# Allows any user to run mopidy, but runs by default as a randomly generated UID/GID.
|
||||
ENV HOME=/var/lib/mopidy
|
||||
RUN set -ex \
|
||||
&& usermod -G audio,sudo mopidy \
|
||||
&& chown mopidy:audio -R $HOME /entrypoint.sh \
|
||||
&& chmod go+rwx -R $HOME /entrypoint.sh
|
||||
|
||||
# Runs as mopidy user by default.
|
||||
USER mopidy
|
||||
|
||||
VOLUME ["/var/lib/mopidy/local", "/var/lib/mopidy/media"]
|
||||
|
||||
EXPOSE 6600 6680 1705 5555/udp
|
||||
|
||||
ENTRYPOINT ["/usr/bin/dumb-init", "/entrypoint.sh"]
|
||||
CMD ["/usr/bin/mopidy"]
|
||||
0
docker/entrypoint.sh
Normal file → Executable file
0
docker/entrypoint.sh
Normal file → Executable file
@ -5,7 +5,7 @@ data_dir = /var/lib/mopidy
|
||||
media_dir = /var/lib/mopidy/media
|
||||
|
||||
[audio]
|
||||
output = tee name=t ! queue ! autoaudiosink t. ! queue ! udpsink host=0.0.0.0 port=5555
|
||||
#output = tee name=t ! queue ! autoaudiosink t. ! queue ! udpsink host=0.0.0.0 port=5555
|
||||
|
||||
[m3u]
|
||||
playlists_dir = /var/lib/mopidy/playlists
|
||||
|
||||
@ -4501,6 +4501,10 @@ select {
|
||||
left: 0;
|
||||
margin-top: -3px; }
|
||||
.slider__track__progress {
|
||||
-webkit-transition: all 0.2s linear;
|
||||
-moz-transition: all 0.2s linear;
|
||||
-o-transition: all 0.2s linear;
|
||||
transition: all 0.2s linear;
|
||||
position: absolute;
|
||||
background: #08d58f;
|
||||
pointer-events: none;
|
||||
@ -5558,7 +5562,7 @@ main header {
|
||||
position: relative;
|
||||
padding: 18px 40px 16px 22px;
|
||||
margin: 10px 0 0 0;
|
||||
background: #32b5f2;
|
||||
background: #51504e;
|
||||
color: #FFFFFF;
|
||||
pointer-events: all;
|
||||
border-radius: 3px;
|
||||
@ -5621,8 +5625,7 @@ main header {
|
||||
.notifications .notification--process {
|
||||
position: relative;
|
||||
padding-right: 18px;
|
||||
padding-left: 50px;
|
||||
background: #32b5f2; }
|
||||
padding-left: 50px; }
|
||||
.notifications .notification--process.cancelling {
|
||||
color: rgba(255, 255, 255, 0.5); }
|
||||
.notifications .notification--process .loader {
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -14,7 +14,7 @@
|
||||
position: relative;
|
||||
padding: 18px 40px 16px 22px;
|
||||
margin: 10px 0 0 0;
|
||||
background: colour(blue);
|
||||
background: colour(soft_grey);
|
||||
color: colour(white);
|
||||
pointer-events: all;
|
||||
border-radius: 3px;
|
||||
@ -97,7 +97,6 @@
|
||||
position: relative;
|
||||
padding-right: 18px;
|
||||
padding-left: 50px;
|
||||
background: colour(blue);
|
||||
|
||||
&.cancelling {
|
||||
color: rgba(255,255,255,0.5);
|
||||
|
||||
@ -51,6 +51,7 @@
|
||||
margin-top: -3px;
|
||||
|
||||
&__progress {
|
||||
@include animate(0.2s, linear);
|
||||
position: absolute;
|
||||
background: colour(turquoise);
|
||||
pointer-events: none;
|
||||
|
||||
Reference in New Issue
Block a user