From eb46fcc62c2233d25958f0f3d019451006094e8e Mon Sep 17 00:00:00 2001 From: Martin Valba Date: Tue, 2 Jul 2024 18:19:04 +0000 Subject: [PATCH] Little mixup fixup * Basically lets setup universal password 'toor' for user 'root' and 'developer' * why?: because /bin/su wants to fetch password that dosent exist and result is auth info issues where cmds dont get passed over for execution.... --- shell/modules/docker/docker_base_functions.sh | 2 +- shell/modules/docker/docker_setup_main_container.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/shell/modules/docker/docker_base_functions.sh b/shell/modules/docker/docker_base_functions.sh index 25a7622..07dc990 100644 --- a/shell/modules/docker/docker_base_functions.sh +++ b/shell/modules/docker/docker_base_functions.sh @@ -9,7 +9,7 @@ docker_run_essentials() { msg_debug "DOCKER: Running essential commands" # Update ldconfig cache - sudo docker exec --interactive --tty $1 su root -c "ldconfig" + sudo docker exec --interactive --tty $1 su root -c ldconfig } # Start the container diff --git a/shell/modules/docker/docker_setup_main_container.sh b/shell/modules/docker/docker_setup_main_container.sh index 405b8a9..e3128e3 100644 --- a/shell/modules/docker/docker_setup_main_container.sh +++ b/shell/modules/docker/docker_setup_main_container.sh @@ -22,11 +22,17 @@ docker_base_container_sysedit() { set +e + export UNI_PASSWORD=$(echo toor | openssl passwd -1 -stdin) + # Add developer user ( used to build pkg's without root docker_run_cmd $DOCKER_BASE_CONTAINER_NAME "useradd developer -m -g wheel" docker_copy_pkgmanager_conf $DOCKER_BASE_CONTAINER_NAME + # Give users passwd so su dosent whine about auth info issues + docker_run_cmd $DOCKER_BASE_CONTAINER_NAME "usermod --password $UNI_PASSWORD root" + docker_run_cmd $DOCKER_BASE_CONTAINER_NAME "usermod --password $UNI_PASSWORD developer" + # Perms fixes + ${PACKAGE_MANAGER} changes docker_run_cmd $DOCKER_BASE_CONTAINER_NAME "bash -c /home/developer/$TOOL_MAIN_NAME/build/docker/developing/rootsys/developer.sh"