Skip to content

Commit

Permalink
Merge pull request #155 from jameshcorbett/docker-changes
Browse files Browse the repository at this point in the history
Revert docker home mount and change hostname
  • Loading branch information
mergify[bot] authored May 14, 2024
2 parents b9156df + b448d52 commit f75e910
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/test/docker/docker-run-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}"
Expand Down Expand Up @@ -170,6 +170,7 @@ else
--volume=$TOP:/usr/src \
$MOUNT_HOME_ARGS \
$MOUNT_KUBE_ARGS \
-h compute-01 \
-e CC \
-e CXX \
-e LDFLAGS \
Expand Down

0 comments on commit f75e910

Please sign in to comment.