You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/09/01 16:03:38 UTC

[lucene-solr] branch jira/SOLR-13452_gradle_6 updated: SOLR-13452: Try something else for buildTest gradle cache use.

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch jira/SOLR-13452_gradle_6
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/SOLR-13452_gradle_6 by this push:
     new a46a9a7  SOLR-13452: Try something else for buildTest gradle cache use.
a46a9a7 is described below

commit a46a9a7b7236c0aec218348086654cab520199f2
Author: markrmiller <mi...@apple.com>
AuthorDate: Sun Sep 1 10:52:20 2019 -0500

    SOLR-13452: Try something else for buildTest gradle cache use.
---
 buildSrc/build-wdocker-test/Dockerfile |  3 ---
 buildSrc/build-wdocker-test/start.sh   | 15 +--------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/buildSrc/build-wdocker-test/Dockerfile b/buildSrc/build-wdocker-test/Dockerfile
index 2ef73e3..3e23379 100644
--- a/buildSrc/build-wdocker-test/Dockerfile
+++ b/buildSrc/build-wdocker-test/Dockerfile
@@ -37,9 +37,6 @@ RUN useradd -ms /bin/bash lucene
 # Define working directory.
 WORKDIR /home/lucene
 
-RUN mkdir -p /home/lucene/.gradle
-RUN mkdir -p /home/lucene/project
-
 RUN chown -R lucene:lucene /home/lucene
 
 USER lucene
diff --git a/buildSrc/build-wdocker-test/start.sh b/buildSrc/build-wdocker-test/start.sh
index bcc02b8..44d9ade 100644
--- a/buildSrc/build-wdocker-test/start.sh
+++ b/buildSrc/build-wdocker-test/start.sh
@@ -60,18 +60,5 @@ fi
 
 echo "Starting the container ..."
 
-# -v ~/.gradle/wrapper:/home/lucene/gradle/wrapper
-
-docker run -itd --user ${UID} --name=${CONTAINER_NAME} -v "${script_dir}/../..":/home/lucene/project:cached -v ~/.gradle/caches/modules-2:/home/lucene/gradle/caches/modules-2 -h ${CONTAINER_NAME} ${CONTAINER_NAME} || { exit 1; }
-
-
-exec() {
-  echo "exec: $1"
-  docker exec --user ${UID} $2 -t ${CONTAINER_NAME} bash -c "$1"
-  echo "done"
-}
-
-cmd="cp -r /home/lucene/gradle/. /home/lucene/.gradle/;find /home/lucene/.gradle -name '*.lck' -type f -exec rm {} \;"
-exec "${cmd}" "${exec_args}" || { exit 1; }
-
+docker run -itd --user ${UID} --name=${CONTAINER_NAME} -v "${script_dir}/../..":/home/lucene/project:cached -v ~/.gradle/caches/modules-2:/home/lucene/.gradle/caches/modules-2:cached -v ~/.gradle/wrapper:/home/lucene/.gradle/wrapper:cached -h ${CONTAINER_NAME} ${CONTAINER_NAME} || { exit 1; }