diff options
author | Olaf Flebbe <of@oflebbe.de> | 2016-06-07 23:32:48 +0200 |
---|---|---|
committer | Olaf Flebbe <of@oflebbe.de> | 2016-06-08 21:36:58 +0200 |
commit | 5aa519cd785938267b05c6953554f15018eb9564 (patch) | |
tree | 7e11eea4c34259a05ae57d1ba3d8cb207ca3590f /docker | |
parent | 9299713a2c59b7c605ec8a3d118244562485bf59 (diff) |
BIGTOP-2474: Improve handling of gradle home
Diffstat (limited to 'docker')
-rw-r--r-- | docker/bigtop-slaves/centos-6/Dockerfile | 6 | ||||
-rw-r--r-- | docker/bigtop-slaves/centos-7/Dockerfile | 6 | ||||
-rw-r--r-- | docker/bigtop-slaves/debian-8/Dockerfile | 6 | ||||
-rw-r--r-- | docker/bigtop-slaves/fedora-20/Dockerfile | 6 | ||||
-rw-r--r-- | docker/bigtop-slaves/opensuse-13.2/Dockerfile | 6 | ||||
-rw-r--r-- | docker/bigtop-slaves/opensuse-42.1/Dockerfile | 6 | ||||
-rw-r--r-- | docker/bigtop-slaves/ubuntu-14.04-aarch64/Dockerfile | 7 | ||||
-rwxr-xr-x | docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile | 6 | ||||
-rw-r--r-- | docker/bigtop-slaves/ubuntu-14.04/Dockerfile | 6 | ||||
-rw-r--r-- | docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile | 6 | ||||
-rw-r--r-- | docker/bigtop-slaves/ubuntu-15.04/Dockerfile | 6 | ||||
-rw-r--r-- | docker/bigtop-slaves/ubuntu-16.04-ppc64le/Dockerfile | 6 | ||||
-rw-r--r-- | docker/bigtop-slaves/ubuntu-16.04/Dockerfile | 6 |
13 files changed, 26 insertions, 53 deletions
diff --git a/docker/bigtop-slaves/centos-6/Dockerfile b/docker/bigtop-slaves/centos-6/Dockerfile index 6dfef5dc..a5a3b69e 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 diff --git a/docker/bigtop-slaves/centos-7/Dockerfile b/docker/bigtop-slaves/centos-7/Dockerfile index a9888b45..5425175f 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 diff --git a/docker/bigtop-slaves/debian-8/Dockerfile b/docker/bigtop-slaves/debian-8/Dockerfile index 64ce1f99..0022c51d 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 diff --git a/docker/bigtop-slaves/fedora-20/Dockerfile b/docker/bigtop-slaves/fedora-20/Dockerfile index 2e5c81d8..dd1e9f47 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 diff --git a/docker/bigtop-slaves/opensuse-13.2/Dockerfile b/docker/bigtop-slaves/opensuse-13.2/Dockerfile index f166824d..0c35b341 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 diff --git a/docker/bigtop-slaves/opensuse-42.1/Dockerfile b/docker/bigtop-slaves/opensuse-42.1/Dockerfile index d711c8a2..e8dad4cd 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 diff --git a/docker/bigtop-slaves/ubuntu-14.04-aarch64/Dockerfile b/docker/bigtop-slaves/ubuntu-14.04-aarch64/Dockerfile index bec0e904..e88516bd 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 diff --git a/docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile b/docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile index 6cd6523a..353dfa50 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 diff --git a/docker/bigtop-slaves/ubuntu-14.04/Dockerfile b/docker/bigtop-slaves/ubuntu-14.04/Dockerfile index d71bbab5..17132c0b 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 diff --git a/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile b/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile index d5a4b0fc..995412a3 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 diff --git a/docker/bigtop-slaves/ubuntu-15.04/Dockerfile b/docker/bigtop-slaves/ubuntu-15.04/Dockerfile index ad6710de..9a622a33 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 diff --git a/docker/bigtop-slaves/ubuntu-16.04-ppc64le/Dockerfile b/docker/bigtop-slaves/ubuntu-16.04-ppc64le/Dockerfile index 595f4672..9623648e 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 diff --git a/docker/bigtop-slaves/ubuntu-16.04/Dockerfile b/docker/bigtop-slaves/ubuntu-16.04/Dockerfile index 7a92d4a6..08d1a961 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 |