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.

Sign up for GitHub

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

Allow blueos to use binaries on the host computer by default #2157

Merged
merged 3 commits into from
Oct 11, 2023
Merged

Allow blueos to use binaries on the host computer by default #2157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1005717
bootstrap: startup.json.default: Add /usr/blueos/bin
patrickelectric Oct 11, 2023
a3b6a36
core: Dockerfile: Add /usr/blueos/bin on PATH
patrickelectric Oct 11, 2023
6bcf5b2
core: tools: blueos_startup_update: Add /usr/blueos/bin
patrickelectric Oct 11, 2023
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
4 changes: 4 additions & 0 deletions bootstrap/startup.json.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
"bind": "/usr/blueos/extensions",
"mode": "rw"
},
"/usr/blueos/bin": {
"bind": "/usr/blueos/bin",
"mode": "rw"
},
"/etc/resolv.conf.host": {
"bind": "/etc/resolv.conf.host",
"mode": "ro"
Expand Down
3 changes: 2 additions & 1 deletion core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ RUN [ -z "$GIT_DESCRIBE_TAGS" ] \
# Update blueosrc with the necessary environment variables
RUN RCFILE_PATH="/etc/blueosrc" \
&& echo "export GIT_DESCRIBE_TAGS=$GIT_DESCRIBE_TAGS" >> $RCFILE_PATH \
&& echo "export HISTFILE=/etc/blueos/.bash_history" >> $RCFILE_PATH
&& echo "export HISTFILE=/etc/blueos/.bash_history" >> $RCFILE_PATH \
&& echo "export PATH=/usr/blueos/bin:$PATH" >> $RCFILE_PATH

# create some Symlinks to make life easier
RUN mkdir -p /shortcuts
Expand Down
4 changes: 4 additions & 0 deletions core/tools/blueos_startup_update/blueos_startup_update
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ DELTA_JSON = {
"bind": "/usr/blueos/extensions",
"mode": "rw"
},
"/usr/blueos/bin": {
"bind": "/usr/blueos/bin",
"mode": "rw"
},
"/etc/resolv.conf.host": {
"bind": "/etc/resolv.conf.host",
"mode": "ro"
Expand Down