You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2015/11/01 20:01:11 UTC
bigtop git commit: BIGTOP-2103. [Docker] Move bigtop/slaves image
build to gradle
Repository: bigtop
Updated Branches:
refs/heads/master 7aab87488 -> c39701234
BIGTOP-2103. [Docker] Move bigtop/slaves image build to gradle
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c3970123
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c3970123
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c3970123
Branch: refs/heads/master
Commit: c39701234cdb476b7268860e9a362dbbd1fcede3
Parents: 7aab874
Author: Evans Ye <ev...@apache.org>
Authored: Sun Nov 1 16:07:28 2015 +0000
Committer: Olaf Flebbe <of...@ofleb.be>
Committed: Sun Nov 1 19:57:45 2015 +0100
----------------------------------------------------------------------
build.gradle | 19 +++++++++++++++++++
docker/bigtop-slaves/centos-6/build.sh | 17 -----------------
docker/bigtop-slaves/centos-7/build.sh | 17 -----------------
docker/bigtop-slaves/debian-8/build.sh | 17 -----------------
docker/bigtop-slaves/fedora-20/build.sh | 17 -----------------
docker/bigtop-slaves/opensuse-13.2/build.sh | 17 -----------------
docker/bigtop-slaves/ubuntu-14.04/build.sh | 17 -----------------
7 files changed, 19 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c3970123/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 9894656..eab4f1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -174,6 +174,7 @@ project(':itest-common') {
def TESTARTIFACTS_GROUP = 'test artifacts'
def DEVENV_GROUP = 'development tools'
def DEPLOY_GROUP = 'deployment'
+def DOCKERBUILD_GROUP = 'docker build'
// All packaging logic is separated into its own build module
apply from: 'packages.gradle'
@@ -309,6 +310,24 @@ def artifactToInstall = {
}
}
+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' +
+ 'The built image name: bigtop/slaves:1.0.0-debian-8',
+ group: DOCKERBUILD_GROUP) {
+ def _prefix = project.hasProperty("prefix") ? prefix : "trunk"
+ def _OS = project.hasProperty("OS") ? OS : "centos-7"
+ def command = [
+ 'docker', 'build',
+ '-t', 'bigtop/slaves:' + _prefix + '-' + _OS,
+ '-f', "docker/bigtop-slaves/" + _OS + "/Dockerfile",
+ '.'
+ ]
+ workingDir '.'
+ commandLine command
+}
+
project.afterEvaluate{
artifactToInstall(dependsOn: [installTopLevel, installCommon, installConf, installiTest])
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c3970123/docker/bigtop-slaves/centos-6/build.sh
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/centos-6/build.sh b/docker/bigtop-slaves/centos-6/build.sh
deleted file mode 100755
index c22cbf3..0000000
--- a/docker/bigtop-slaves/centos-6/build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-cp -r ../../../bigtop_toolchain .
-docker build -t bigtop/slaves:trunk-centos-6 .
-rm -rf bigtop_toolchain
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c3970123/docker/bigtop-slaves/centos-7/build.sh
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/centos-7/build.sh b/docker/bigtop-slaves/centos-7/build.sh
deleted file mode 100755
index 8edd41d..0000000
--- a/docker/bigtop-slaves/centos-7/build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-cp -r ../../../bigtop_toolchain .
-docker build -t bigtop/slaves:trunk-centos-7 .
-rm -rf bigtop_toolchain
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c3970123/docker/bigtop-slaves/debian-8/build.sh
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/debian-8/build.sh b/docker/bigtop-slaves/debian-8/build.sh
deleted file mode 100755
index 61be971..0000000
--- a/docker/bigtop-slaves/debian-8/build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-cp -r ../../../bigtop_toolchain .
-docker build -t bigtop/slaves:trunk-debian-8 .
-rm -rf bigtop_toolchain
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c3970123/docker/bigtop-slaves/fedora-20/build.sh
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/fedora-20/build.sh b/docker/bigtop-slaves/fedora-20/build.sh
deleted file mode 100755
index b62adda..0000000
--- a/docker/bigtop-slaves/fedora-20/build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-cp -r ../../../bigtop_toolchain .
-docker build -t bigtop/slaves:trunk-fedora-20 .
-rm -rf bigtop_toolchain
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c3970123/docker/bigtop-slaves/opensuse-13.2/build.sh
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/opensuse-13.2/build.sh b/docker/bigtop-slaves/opensuse-13.2/build.sh
deleted file mode 100755
index 7fa9860..0000000
--- a/docker/bigtop-slaves/opensuse-13.2/build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-cp -r ../../../bigtop_toolchain .
-docker build -t bigtop/slaves:trunk-opensuse-13.2 .
-rm -rf bigtop_toolchain
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c3970123/docker/bigtop-slaves/ubuntu-14.04/build.sh
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/ubuntu-14.04/build.sh b/docker/bigtop-slaves/ubuntu-14.04/build.sh
deleted file mode 100755
index 9d6d369..0000000
--- a/docker/bigtop-slaves/ubuntu-14.04/build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-cp -r ../../../bigtop_toolchain .
-docker build -t bigtop/slaves:trunk-ubuntu-14.04 .
-rm -rf bigtop_toolchain