bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ofle...@apache.org
Subject [29/51] [abbrv] bigtop git commit: BIGTOP-2474: Improve handling of gradle home
Date Fri, 29 Jul 2016 17:03:10 GMT
BIGTOP-2474: Improve handling of gradle home


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/5aa519cd
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/5aa519cd
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/5aa519cd

Branch: refs/heads/BIGTOP-2253
Commit: 5aa519cd785938267b05c6953554f15018eb9564
Parents: 9299713
Author: Olaf Flebbe <of@oflebbe.de>
Authored: Tue Jun 7 23:32:48 2016 +0200
Committer: Olaf Flebbe <of@oflebbe.de>
Committed: Wed Jun 8 21:36:58 2016 +0200

----------------------------------------------------------------------
 build.gradle                                         | 15 +--------------
 docker/bigtop-slaves/centos-6/Dockerfile             |  6 ++----
 docker/bigtop-slaves/centos-7/Dockerfile             |  6 ++----
 docker/bigtop-slaves/debian-8/Dockerfile             |  6 ++----
 docker/bigtop-slaves/fedora-20/Dockerfile            |  6 ++----
 docker/bigtop-slaves/opensuse-13.2/Dockerfile        |  6 ++----
 docker/bigtop-slaves/opensuse-42.1/Dockerfile        |  6 ++----
 docker/bigtop-slaves/ubuntu-14.04-aarch64/Dockerfile |  7 ++-----
 docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile |  6 ++----
 docker/bigtop-slaves/ubuntu-14.04/Dockerfile         |  6 ++----
 docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile |  6 ++----
 docker/bigtop-slaves/ubuntu-15.04/Dockerfile         |  6 ++----
 docker/bigtop-slaves/ubuntu-16.04-ppc64le/Dockerfile |  6 ++----
 docker/bigtop-slaves/ubuntu-16.04/Dockerfile         |  6 ++----
 14 files changed, 27 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index d1c5b99..f0fe7d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -400,20 +400,7 @@ task "configure-nexus"(dependsOn: tasks.findAll { alltask -> alltask.name.starts
    writer.append("</mirrors></settings>")
 }
 
-task "gen-gradle-home"(type:Exec,
-    description: 'Pre-load gradle home as cache for bigtop/slaves images',
-    group: DOCKERBUILD_GROUP) {
-  def dir = System.getProperty("user.dir")
-  def command = [
-      './gradlew', '-g', dir + '/gradle.home'
-  ]
-  workingDir '.'
-  commandLine command
-  //store the output instead of printing to the console:
-  standardOutput = new ByteArrayOutputStream()
-}
-
-task "bigtop-slaves"(dependsOn: 'gen-gradle-home', type:Exec,
+task "bigtop-slaves"(type:Exec,
     description: 'Build bigtop/slaves images.\n' +
       'Usage:\n  $ ./gradlew -POS=[centos-6|centos-7|fedora-20|debian-8|ubuntu-14.04|opensuse-13.2]
-Pprefix=STRING_TO_PREFIX bigtop-slaves\n' +
       'Example:\n  $ ./gradlew -POS=debian-8 -Pprefix=1.0.0 bigtop-slaves\n' +

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/centos-6/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/centos-6/Dockerfile b/docker/bigtop-slaves/centos-6/Dockerfile
index 6dfef5d..a5a3b69 100644
--- a/docker/bigtop-slaves/centos-6/Dockerfile
+++ b/docker/bigtop-slaves/centos-6/Dockerfile
@@ -16,9 +16,7 @@ FROM bigtop/puppet:centos-6
 MAINTAINER oflebbe@apache.org
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/centos-7/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/centos-7/Dockerfile b/docker/bigtop-slaves/centos-7/Dockerfile
index a9888b4..5425175 100644
--- a/docker/bigtop-slaves/centos-7/Dockerfile
+++ b/docker/bigtop-slaves/centos-7/Dockerfile
@@ -16,9 +16,7 @@ FROM bigtop/puppet:centos-7
 MAINTAINER oflebbe@apache.org
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/debian-8/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/debian-8/Dockerfile b/docker/bigtop-slaves/debian-8/Dockerfile
index 64ce1f9..0022c51 100644
--- a/docker/bigtop-slaves/debian-8/Dockerfile
+++ b/docker/bigtop-slaves/debian-8/Dockerfile
@@ -16,9 +16,7 @@ FROM bigtop/puppet:debian-8
 MAINTAINER oflebbe@apache.org
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/fedora-20/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/fedora-20/Dockerfile b/docker/bigtop-slaves/fedora-20/Dockerfile
index 2e5c81d..dd1e9f4 100644
--- a/docker/bigtop-slaves/fedora-20/Dockerfile
+++ b/docker/bigtop-slaves/fedora-20/Dockerfile
@@ -16,9 +16,7 @@ FROM bigtop/puppet:fedora-20
 MAINTAINER oflebbe@apache.org
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/opensuse-13.2/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/opensuse-13.2/Dockerfile b/docker/bigtop-slaves/opensuse-13.2/Dockerfile
index f166824..0c35b34 100644
--- a/docker/bigtop-slaves/opensuse-13.2/Dockerfile
+++ b/docker/bigtop-slaves/opensuse-13.2/Dockerfile
@@ -16,9 +16,7 @@ FROM bigtop/puppet:opensuse-13.2
 MAINTAINER evansye@apache.org
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/opensuse-42.1/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/opensuse-42.1/Dockerfile b/docker/bigtop-slaves/opensuse-42.1/Dockerfile
index d711c8a..e8dad4c 100644
--- a/docker/bigtop-slaves/opensuse-42.1/Dockerfile
+++ b/docker/bigtop-slaves/opensuse-42.1/Dockerfile
@@ -16,9 +16,7 @@ FROM bigtop/puppet:opensuse-42.1
 MAINTAINER dev@bigtop.apache.org
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/ubuntu-14.04-aarch64/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/ubuntu-14.04-aarch64/Dockerfile b/docker/bigtop-slaves/ubuntu-14.04-aarch64/Dockerfile
index bec0e90..e88516b 100644
--- a/docker/bigtop-slaves/ubuntu-14.04-aarch64/Dockerfile
+++ b/docker/bigtop-slaves/ubuntu-14.04-aarch64/Dockerfile
@@ -16,11 +16,8 @@ FROM aarch64/ubuntu
 MAINTAINER Roman Shaposhnik <rvs@apache.org>
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN /etc/puppet/modules/bigtop_toolchain/bin/puppetize.sh
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
-
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile b/docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile
index 6cd6523..353dfa5 100755
--- a/docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile
+++ b/docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile
@@ -16,9 +16,7 @@ FROM bigtop/puppet:ubuntu-14.04-ppc64le
 MAINTAINER Amir Sanjar
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/ubuntu-14.04/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/ubuntu-14.04/Dockerfile b/docker/bigtop-slaves/ubuntu-14.04/Dockerfile
index d71bbab..17132c0 100644
--- a/docker/bigtop-slaves/ubuntu-14.04/Dockerfile
+++ b/docker/bigtop-slaves/ubuntu-14.04/Dockerfile
@@ -16,9 +16,7 @@ FROM bigtop/puppet:ubuntu-14.04
 MAINTAINER oflebbe@apache.org
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile b/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile
index d5a4b0f..995412a 100644
--- a/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile
+++ b/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile
@@ -16,9 +16,7 @@ FROM bigtop/puppet:ubuntu-15.04-ppc64le
 MAINTAINER Amir Sanjar
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/ubuntu-15.04/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/ubuntu-15.04/Dockerfile b/docker/bigtop-slaves/ubuntu-15.04/Dockerfile
index ad6710d..9a622a3 100644
--- a/docker/bigtop-slaves/ubuntu-15.04/Dockerfile
+++ b/docker/bigtop-slaves/ubuntu-15.04/Dockerfile
@@ -16,9 +16,7 @@ FROM bigtop/puppet:ubuntu-15.04
 MAINTAINER Amir Sanjar
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/ubuntu-16.04-ppc64le/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/ubuntu-16.04-ppc64le/Dockerfile b/docker/bigtop-slaves/ubuntu-16.04-ppc64le/Dockerfile
index 595f467..9623648 100644
--- a/docker/bigtop-slaves/ubuntu-16.04-ppc64le/Dockerfile
+++ b/docker/bigtop-slaves/ubuntu-16.04-ppc64le/Dockerfile
@@ -16,9 +16,7 @@ FROM bigtop/puppet:ubuntu-16.04-ppc64le
 MAINTAINER Amir Sanjar
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aa519cd/docker/bigtop-slaves/ubuntu-16.04/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/ubuntu-16.04/Dockerfile b/docker/bigtop-slaves/ubuntu-16.04/Dockerfile
index 7a92d4a..08d1a96 100644
--- a/docker/bigtop-slaves/ubuntu-16.04/Dockerfile
+++ b/docker/bigtop-slaves/ubuntu-16.04/Dockerfile
@@ -16,9 +16,7 @@ FROM bigtop/puppet:ubuntu-16.04
 MAINTAINER Amir Sanjar
 
 COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-COPY gradle.home /usr/share/gradle.home
 
 RUN puppet apply -e "include bigtop_toolchain::installer"
-RUN chown jenkins:jenkins /usr/share/gradle.home
-
-ENV GRADLE_USER_HOME=/usr/share/gradle.home
+COPY . /tmp/bigtop
+RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop


Mime
View raw message