enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

armbian-next: docker-shell: provide SSH and forward ssh auth socket to docker-shell

Browse Source
This commit is contained in:
Ricardo Pardini 2023-01-30 22:48:35 +01:00
parent 388c76c91b
commit 3f91b77e3f
No known key found for this signature in database
GPG Key ID: 3D38CA12A66C5D02
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/functions/cli/cli-docker.sh
View File

@ -4,6 +4,16 @@ function cli_docker_pre_run() {
return 0
fi
case "${DOCKER_SUBCMD}" in
shell)
# inside-function-function: a dynamic hook, only triggered if this CLI runs.
function add_host_dependencies__ssh_client_for_docker_shell_over_ssh() {
export EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} openssh-client"
}
declare -g DOCKER_PASS_SSH_AGENT="yes" # Pass SSH agent to docker
;;
esac
# make sure we're not _ALREADY_ running under docker... otherwise eternal loop?
if [[ "${ARMBIAN_RUNNING_IN_CONTAINER}" == "yes" ]]; then
exit_with_error "asking for docker... inside docker. how did this happen? Tip: you don't need 'docker' to run armbian-next inside Docker; it's automatically detected and used when appropriate."
@ -11,12 +21,6 @@ function cli_docker_pre_run() {
}
function cli_docker_run() {
case "${DOCKER_SUBCMD}" in
shell)
declare -g DOCKER_PASS_SSH_AGENT="yes" # Pass SSH agent to docker
;;
esac
LOG_SECTION="docker_cli_prepare" do_with_logging docker_cli_prepare
# @TODO: and can be very well said that in CI, we always want FAST_DOCKER=yes, unless we're building the Docker image itself.