Move enter-build-container-internal.sh into build/ folder.

+ cd to vespa dir to avoid repeated '../'

2 files changed, 9 insertions, 10 deletions

diff --git a/docker/enter-build-container-internal.sh b/docker/build/enter-build-container-internal.sh
index 1a45076f706..ae76263e2c7 100755
--- a/docker/enter-build-container-internal.sh
+++ b/docker/build/enter-build-container-internal.sh
@@ -9,15 +9,15 @@ if [ $# -ne 0 ]; then
 fi
 
 USERNAME=builder
-DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
-cd $DIR
+VESPA_DIR=$(cd $(dirname "${BASH_SOURCE[0]}")/../.. && pwd)
+cd $VESPA_DIR
 
-CALLER_UID=$(stat -c "%u" $DIR)
+CALLER_UID=$(stat -c "%u" $VESPA_DIR)
 
 if [ $CALLER_UID -ne 0 ]; then
   # We are in a system that maps the uids and this dir is not owned by root
   # Create a user with same uid and gid to avoid mixing
-  CALLER_GID=$(stat -c "%g" $DIR)
+  CALLER_GID=$(stat -c "%g" $VESPA_DIR)
 
   groupadd -f -g $CALLER_GID $USERNAME
   useradd -u $CALLER_UID -g $CALLER_GID $USERNAME
@@ -26,12 +26,11 @@ else
   USERNAME=root
 fi
 
-su -c "mkdir -p $DIR/../.ccache" - $USERNAME
-su -c "ln -sf $DIR/../.ccache \$HOME/.ccache" - $USERNAME
+su -c "mkdir -p $VESPA_DIR/.ccache" - $USERNAME
+su -c "ln -sf $VESPA_DIR/.ccache \$HOME/.ccache" - $USERNAME
 
-su -c "mkdir -p $DIR/../.m2" - $USERNAME
-su -c "ln -sf $DIR/../.m2 \$HOME/.m2" - $USERNAME
+su -c "mkdir -p $VESPA_DIR/.m2" - $USERNAME
+su -c "ln -sf $VESPA_DIR/.m2 \$HOME/.m2" - $USERNAME
 
-cd $DIR/.. 
 su $USERNAME
 
diff --git a/docker/enter-build-container.sh b/docker/enter-build-container.sh
index 677507088f4..fd433bc19c3 100755
--- a/docker/enter-build-container.sh
+++ b/docker/enter-build-container.sh
@@ -13,5 +13,5 @@ cd $DIR
 DOCKER_IMAGE="vespabuild"
 
 docker build -t "$DOCKER_IMAGE" -f build/Dockerfile .
-docker run -ti --rm -v $(pwd)/..:/vespa --entrypoint /vespa/docker/enter-build-container-internal.sh "$DOCKER_IMAGE"
+docker run -ti --rm -v $(pwd)/..:/vespa --entrypoint /vespa/docker/build/enter-build-container-internal.sh "$DOCKER_IMAGE"