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

Osp run mount #480

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all 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
6 changes: 5 additions & 1 deletion endpoints/base
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ function process_opts() {
local longopts+=",packrat-dir:,bench-ids:"
local opts=$(getopt -q -o "" --longoptions "$longopts" -n "getopt.sh" -- "$@");
if [ $? -ne 0 ]; then
exit_error "Unrecognized option specified" endpoint-deploy
exit_error "Unrecognized option specified" endpoint-deploy
fi
eval set -- "$opts";
while true; do
Expand All @@ -163,6 +163,10 @@ function process_opts() {
do_validate="1"
shift;
;;
--build)
do_build="1"
shift;
;;
--endpoint-opts)
shift;
endpoint_opts="$1"
Expand Down
1 change: 1 addition & 0 deletions endpoints/osruntime-bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ function launch_osruntime() {
cs_cmd+=" --net=host"
cs_cmd+=" --security-opt=label=disable"
cs_cmd+=" --mount=type=bind,source=$data_dir,destination=/tmp"
cs_cmd+=" --mount=type=bind,source=/run,destination=/run"
cs_cmd+=" --mount=type=bind,source=/lib/firmware,destination=/lib/firmware"
cs_cmd+=" --mount=type=bind,source=/lib/modules,destination=/lib/modules"
cs_cmd+=" --mount=type=bind,source=/usr/src,destination=/usr/src"
Expand Down
9 changes: 9 additions & 0 deletions endpoints/remotehost/remotehost
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,14 @@ function remotehost_req_check() {
fi
}

function remotehost_build() {
# Use workshop in the controller image to build images used for this endpoint
if [ "$do_build" == 1 ]; then
echo "userenv $userenv"
exit
fi
}

function stop_pod() {
local engine_label=$1; shift

Expand Down Expand Up @@ -689,6 +697,7 @@ init_common_dirs
init_remotehost_dirs
load_settings
remotehost_req_check
remotehost_build
set_ssh_id
base_req_check
# Remotehost tool collection only needs first engine to determine profiler engines
Expand Down
Loading