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

Fix Docker for pyzmq #2167

Closed
Closed
Show file tree
Hide file tree
Changes from 3 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
2 changes: 1 addition & 1 deletion docker/config/docker.mpd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# be disabled and audio files will only be accepted over ipc socket (using
# file:// protocol) or streaming files over an accepted protocol.
#
music_directory "/home/pi/RPi-Jukebox-RFID/shared/audiofolders"
music_directory "~/RPi-Jukebox-RFID/shared/audiofolders"
#
# This setting sets the MPD internal playlist directory. The purpose of this
# directory is storage for playlists created by MPD. The server will use
Expand Down
10 changes: 5 additions & 5 deletions docker/docker-compose.linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ services:
environment:
- PULSE_SERVER=unix:/tmp/pulse-sock
volumes:
- ../shared/audiofolders:/home/pi/RPi-Jukebox-RFID/shared/audiofolders
- ../shared/playlists:/home/pi/.config/mpd/playlists
- ./config/docker.pulse.mpd.conf:/home/pi/.config/mpd/mpd.conf
- ../shared/audiofolders:${HOME}/RPi-Jukebox-RFID/shared/audiofolders
- ../shared/playlists:${HOME}/.config/mpd/playlists
- ./config/docker.pulse.mpd.conf:${HOME}/.config/mpd/mpd.conf
s-martin marked this conversation as resolved.
Show resolved Hide resolved
- $XDG_RUNTIME_DIR/pulse/native:/tmp/pulse-sock

jukebox:
Expand All @@ -24,6 +24,6 @@ services:
environment:
- PULSE_SERVER=unix:/tmp/pulse-sock
volumes:
- ../shared:/home/pi/RPi-Jukebox-RFID/shared
- ./config/docker.pulse.mpd.conf:/home/pi/.config/mpd/mpd.conf
- ../shared:${HOME}/RPi-Jukebox-RFID/shared
- ./config/docker.pulse.mpd.conf:${HOME}/.config/mpd/mpd.conf
s-martin marked this conversation as resolved.
Show resolved Hide resolved
- $XDG_RUNTIME_DIR/pulse/native:/tmp/pulse-sock
8 changes: 5 additions & 3 deletions docker/jukebox.Dockerfile
s-martin marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ RUN usermod -aG pulse ${USER}
# Install all Jukebox dependencies
RUN apt-get update && apt-get install -qq -y \
--allow-downgrades --allow-remove-essential --allow-change-held-packages \
gcc at wget \
g++ at wget \
espeak mpc mpg123 git ffmpeg spi-tools netcat \
python3 python3-venv python3-dev python3-mutagen

USER ${USER}
WORKDIR ${HOME}

ENV VIRTUAL_ENV=${INSTALLATION_PATH}/.venv
RUN python3 -m venv $VIRTUAL_ENV
ENV PATH="$VIRTUAL_ENV/bin:$PATH"

USER ${USER}
WORKDIR ${HOME}
COPY --chown=${USER}:${USER} . ${INSTALLATION_PATH}/

RUN pip install --no-cache-dir -r ${INSTALLATION_PATH}/requirements.txt
Expand All @@ -46,6 +47,7 @@ RUN [ "$(uname -m)" = "aarch64" ] && ARCH="arm64" || ARCH="$(uname -m)"; \

RUN export ZMQ_PREFIX=${PREFIX} && export ZMQ_DRAFT_API=1
RUN pip install -v --no-binary pyzmq --pre pyzmq
s-martin marked this conversation as resolved.
Show resolved Hide resolved
#RUN pip install -v --no-binary=:all: pyzmq --pre pyzmq

EXPOSE 5555 5556

Expand Down