-
Notifications
You must be signed in to change notification settings - Fork 396
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
docker: optimizations #2074
Merged
Merged
docker: optimizations #2074
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,13 @@ | ||
.git | ||
.githooks | ||
.github | ||
.dockerignore | ||
.DS_Store | ||
|
||
# Application | ||
docker | ||
docs | ||
installation | ||
src | ||
shared | ||
|
||
# webapp | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,2 @@ | ||
playermpd: | ||
host: mpd | ||
mpd_conf: /etc/mpd.conf | ||
pulse: | ||
outputs: | ||
primary: | ||
pulse_sink_name: Channel_1__Channel_2.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,29 @@ | ||
version: "3.9" | ||
|
||
services: | ||
mpd: | ||
devices: | ||
- /dev/snd | ||
|
||
jukebox: | ||
devices: | ||
- /dev/snd | ||
version: "3.9" | ||
|
||
services: | ||
mpd: | ||
build: | ||
args: | ||
- UID=${UID:-1000} | ||
- USER=pi | ||
- HOME=/home/pi | ||
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 | ||
- $XDG_RUNTIME_DIR/pulse/native:/tmp/pulse-sock | ||
|
||
jukebox: | ||
build: | ||
args: | ||
- UID=${UID:-1000} | ||
- USER=pi | ||
- HOME=/home/pi | ||
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 | ||
- $XDG_RUNTIME_DIR/pulse/native:/tmp/pulse-sock |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why don't we want to ignore this anymore?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The jukebox calls git to show some git values on startup. Without the .git folder this runs into an error. I know it's not a vital function, but I wanted to resolve warnings and errors wherever possible, so when a "real" error occurs you don't get distracted by these "built-in" errors.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm. I understand the reasoning behind it. But this folder can grow a lot over time. So maybe the best approach would be to remove the git command? If it runs into errors, it doesn't work anyways and might be useful.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Re-added .git along with hidden github dirs and added the git errors to the known to-be-ignored errors in the doc