Skip to content

Commit f75e910

Browse files
authored
Merge pull request #155 from jameshcorbett/docker-changes
Revert docker home mount and change hostname
2 parents b9156df + b448d52 commit f75e910

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/test/docker/docker-run-checks.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ BASE_DOCKER_REPO=fluxrm/flux-sched
1212

1313
IMAGE=focal
1414
JOBS=2
15-
MOUNT_HOME_ARGS="--volume=$HOME:$HOME -e HOME"
15+
MOUNT_HOME_ARGS="--volume=$HOME:/home/$USER -e HOME"
1616
MOUNT_KUBE_ARGS="--volume=$HOME/.kube:/usr/local/share/kube-localhost"
1717

1818
if test "$PROJECT" = "flux-core"; then
@@ -134,7 +134,7 @@ checks_group "Building image $IMAGE for user $USER $(id -u) group=$(id -g)" \
134134
|| die "docker build failed"
135135

136136
if [[ -n "$MOUNT_HOME_ARGS" ]]; then
137-
echo "mounting $HOME as $HOME"
137+
echo "mounting $HOME as /home/$USER"
138138
fi
139139
if [[ -n "$MOUNT_KUBE_ARGS" ]]; then
140140
echo "mounting kube config inside container with ${MOUNT_KUBE_ARGS}"
@@ -170,6 +170,7 @@ else
170170
--volume=$TOP:/usr/src \
171171
$MOUNT_HOME_ARGS \
172172
$MOUNT_KUBE_ARGS \
173+
-h compute-01 \
173174
-e CC \
174175
-e CXX \
175176
-e LDFLAGS \

0 commit comments

Comments
 (0)