Fixup MAVEN_CONFIG environment variable to not collide with mvnw wrap…

…per (#462) Fixes #457
cmu-db · Feb 9, 2024 · 5a67bf8 · 5a67bf8
1 parent 3dc84d9
commit 5a67bf8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -32,7 +32,7 @@
         "http_proxy": "${localEnv:http_proxy}",
         "https_proxy": "${localEnv:https_proxy}",
         "no_proxy": "${localEnv:no_proxy}",
-        "MAVEN_CONFIG": "${localEnv:HOME}/.m2",
+        "MAVEN_CONFIG_DIR": "${localEnv:HOME}/.m2",
         "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}",
         "CONTAINER_WORKSPACE_FOLDER": "${containerWorkspaceFolder}"
     },

diff --git a/docker/benchbase/README.md b/docker/benchbase/README.md
@@ -75,9 +75,9 @@ docker pull benchbase.azurecr.io/benchbase-dev
 docker run -it --rm -v /path/to/src:/benchbase benchbase.azurecr.io/benchbase-dev
 ```
 
-> Optional: also reuse the local `MAVEN_CONFIG` and it's repository download cache with the following argument:
+> Optional: also reuse the local `MAVEN_CONFIG_DIR` and it's repository download cache with the following argument:
 >
-> `-v "${MAVEN_CONFIG:-$HOME/.m2}:/home/containeruser/.m2"`
+> `-v "${MAVEN_CONFIG_DIR:-$HOME/.m2}:/home/containeruser/.m2"`
 
 ```sh
 docker pull benchbase.azurecr.io/benchbase

diff --git a/docker/benchbase/devcontainer/Dockerfile b/docker/benchbase/devcontainer/Dockerfile
@@ -20,7 +20,9 @@ RUN groupadd --non-unique --gid ${CONTAINERUSER_GID} containergroup \
     && echo 'containeruser ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 RUN mkdir -p /benchbase/results && chown -R containeruser:containergroup /benchbase/
 USER containeruser
-ENV MAVEN_CONFIG=/home/containeruser/.m2
+# Unset the upstream MVN_CONFIG value - it interacts poorly with the mvnw wrapper.
+ENV MAVEN_CONFIG=
+ENV MAVEN_CONFIG_DIR=/home/containeruser/.m2
 WORKDIR /benchbase
 VOLUME /benchbase/results
 

diff --git a/docker/benchbase/run-dev-image.sh b/docker/benchbase/run-dev-image.sh
@@ -26,8 +26,8 @@ else
 fi
 
 cd "$rootdir"
-MAVEN_CONFIG="${MAVEN_CONFIG:-$HOME/.m2}"
-mkdir -p "$MAVEN_CONFIG" || true
+MAVEN_CONFIG_DIR="${MAVEN_CONFIG_DIR:-$HOME/.m2}"
+mkdir -p "$MAVEN_CONFIG_DIR" || true
 set -x
 SRC_DIR="${LOCAL_WORKSPACE_FOLDER:-$PWD}"
 docker run ${INTERACTIVE_ARGS:-} --rm \
@@ -39,5 +39,5 @@ docker run ${INTERACTIVE_ARGS:-} --rm \
     --env DO_FORMAT_CHECKS="$DO_FORMAT_CHECKS" \
     --env EXTRA_MAVEN_ARGS="${EXTRA_MAVEN_ARGS:-}" \
     --user "$CONTAINERUSER_UID:$CONTAINERUSER_GID" \
-    -v "$MAVEN_CONFIG:/home/containeruser/.m2" \
+    -v "$MAVEN_CONFIG_DIR:/home/containeruser/.m2" \
     -v "$SRC_DIR:/benchbase" benchbase-dev:latest $*