Resolving merge conflict
This commit is contained in:
@ -131,7 +131,11 @@ RUN git clone --depth 1 --single-branch -b ${IRIS_VERSION} https://github.com/ja
|
||||
# Install Mopidy Spotify
|
||||
ARG MOPIDY_SPOTIFY_TAG=v5.0.0a1
|
||||
RUN git clone --depth 1 --single-branch -b ${MOPIDY_SPOTIFY_TAG} \
|
||||
&& https://github.com/mopidy/mopidy-spotify.git mopidy-spotify
|
||||
&& https://github.com/mopidy/mopidy-spotify.git mopidy-spotify \
|
||||
&& cd mopidy-spotify \
|
||||
&& python3 setup.py install \
|
||||
&& cd .. \
|
||||
&& rm -rf mopidy-spotify
|
||||
|
||||
# Install additional mopidy extensions and Python dependencies via pip
|
||||
COPY docker/requirements.txt .
|
||||
|
||||
Reference in New Issue
Block a user