From 83541933631588d6b9689de529ff1f0313e7b942 Mon Sep 17 00:00:00 2001 From: James Corbett Date: Thu, 9 May 2024 11:42:30 -0700 Subject: [PATCH 1/2] Revert "docker: mount $HOME as $HOME" This reverts commit 6cda6ad157aa99f55b08eab14b627d34e95eaedd. --- src/test/docker/docker-run-checks.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/docker/docker-run-checks.sh b/src/test/docker/docker-run-checks.sh index 975c7dad..384b1d8e 100755 --- a/src/test/docker/docker-run-checks.sh +++ b/src/test/docker/docker-run-checks.sh @@ -12,7 +12,7 @@ BASE_DOCKER_REPO=fluxrm/flux-sched IMAGE=focal JOBS=2 -MOUNT_HOME_ARGS="--volume=$HOME:$HOME -e HOME" +MOUNT_HOME_ARGS="--volume=$HOME:/home/$USER -e HOME" MOUNT_KUBE_ARGS="--volume=$HOME/.kube:/usr/local/share/kube-localhost" if test "$PROJECT" = "flux-core"; then @@ -134,7 +134,7 @@ checks_group "Building image $IMAGE for user $USER $(id -u) group=$(id -g)" \ || die "docker build failed" if [[ -n "$MOUNT_HOME_ARGS" ]]; then - echo "mounting $HOME as $HOME" + echo "mounting $HOME as /home/$USER" fi if [[ -n "$MOUNT_KUBE_ARGS" ]]; then echo "mounting kube config inside container with ${MOUNT_KUBE_ARGS}" From b448d522da973f60fa7ab9c8bd87cedb85abf326 Mon Sep 17 00:00:00 2001 From: James Corbett Date: Thu, 9 May 2024 11:44:20 -0700 Subject: [PATCH 2/2] docker: change hostname to match nnf kind env Problem: in order to get nnf-deploy's kind environment to match Flux's resource graph, the hostname of the docker container should be compute-01. Change the hostname in docker-run-checks. --- src/test/docker/docker-run-checks.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/docker/docker-run-checks.sh b/src/test/docker/docker-run-checks.sh index 384b1d8e..864048f0 100755 --- a/src/test/docker/docker-run-checks.sh +++ b/src/test/docker/docker-run-checks.sh @@ -170,6 +170,7 @@ else --volume=$TOP:/usr/src \ $MOUNT_HOME_ARGS \ $MOUNT_KUBE_ARGS \ + -h compute-01 \ -e CC \ -e CXX \ -e LDFLAGS \