Skip to content

Commit

Permalink
Resolving merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
jaedb committed Mar 18, 2024
2 parents e5c3821 + cf462eb commit 65a5e61
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down

0 comments on commit 65a5e61

Please sign in to comment.