You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/11/21 11:45:19 UTC
[1/2] brooklyn git commit: Add dockerfile for CI build
Repository: brooklyn
Updated Branches:
refs/heads/master 1ce6bc268 -> 48dbcc3c4
Add dockerfile for CI build
Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/09106a0f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/09106a0f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/09106a0f
Branch: refs/heads/master
Commit: 09106a0fbe4eef46da91ed2005ce9abacd770fa3
Parents: 5f50bc6
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Fri Oct 6 13:22:02 2017 +0000
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Mon Nov 20 10:29:09 2017 +0000
----------------------------------------------------------------------
Dockerfile | 31 +++++++++++++++++++++++++++++++
README.md | 14 +++++++++++---
pom.xml | 2 +-
3 files changed, 43 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn/blob/09106a0f/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..426eb3c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,31 @@
+# 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.
+
+# For all Brooklyn, we use a debian distribution instead of alpine as there are some libgcc incompatibilities with GO
+# and PhantomJS
+FROM maven:3.5.2-jdk-8-slim
+
+# Install the non-headless JRE as some tests requires them
+RUN apt-get update && apt-get install -y openjdk-8-jre
+
+# Install necessary binaries to build brooklyn
+RUN apt-get update && apt-get install -y \
+ git-core \
+ procps \
+ golang-go \
+ rpm \
+ dpkg
http://git-wip-us.apache.org/repos/asf/brooklyn/blob/09106a0f/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 0694b8f..a0e1361 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,15 @@ get this project and its sub-modules:
And then, with jdk 1.8+ and maven 3.1+ installed:
- mvn clean install -Dno-go-client -Dno-rpm
+ mvn clean install -Dno-go-client -Dno-rpm -Dno-deb
+
+However, you won't be able to build the RPM/DEB packages, as well as the CLI. That's why we would recommand to use the
+alternative: a docker container to build this project:
+
+```bash
+docker build -t brooklyn .
+docker run -i --rm --name brooklyn -v ${HOME}/.m2:/root/.m2 -v ${PWD}:/usr/build -w /usr/build brooklyn mvn clean install
+```
The results are in `brooklyn-dist/dist/target/`, including a tar and a zip.
Or to run straight after the build, do:
@@ -37,7 +45,7 @@ Or to run straight after the build, do:
### Resources
<!--- BROOKLYN_VERSION_BELOW -->
-The **[Developers](https://brooklyn.apache.org/developers/)** section of the main website contains more detail on working with the codebase. There is also a more **Developer Guide** specific to each version, including [this branch (0.13.0-SNAPSHOT)](https://brooklyn.apache.org/v/0.13.0-SNAPSHOT/dev/), [latest stable](https://brooklyn.apache.org/v/latest/dev/), and [older releases](https://brooklyn.apache.org/meta/versions.html).
+The **[Developers](https://brooklyn.apache.org/developers/)** section of the main website contains more detail on working with the codebase. There is also a more **Developer Guide** specific to each version, including [this branch (1.0.0-SNAPSHOT)](https://brooklyn.apache.org/v/1.0.0-SNAPSHOT/dev/), [latest stable](https://brooklyn.apache.org/v/latest/dev/), and [older releases](https://brooklyn.apache.org/meta/versions.html).
Useful topics include:
@@ -48,7 +56,7 @@ Useful topics include:
* the **[maven build](http://brooklyn.apache.org/v/latest/dev/env/maven-build.html)** and what to do on build errors
<!--- BROOKLYN_VERSION_BELOW -->
-* **[project structure](https://brooklyn.apache.org/v/0.13.0-SNAPSHOT/dev/code/structure.html)** of the codebase and submodules
+* **[project structure](https://brooklyn.apache.org/v/1.0.0-SNAPSHOT/dev/code/structure.html)** of the codebase and submodules
* the **[people](https://brooklyn.apache.org/community/)** behind Apache Brooklyn
http://git-wip-us.apache.org/repos/asf/brooklyn/blob/09106a0f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a063da8..4147b1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn</artifactId>
- <version>0.13.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<packaging>pom</packaging>
<name>Brooklyn Root</name>
[2/2] brooklyn git commit: This closes #13
Posted by dr...@apache.org.
This closes #13
Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/48dbcc3c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/48dbcc3c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/48dbcc3c
Branch: refs/heads/master
Commit: 48dbcc3c42ac3e216db94c30edbfe98519a79d1d
Parents: 1ce6bc2 09106a0
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Tue Nov 21 11:45:14 2017 +0000
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Tue Nov 21 11:45:14 2017 +0000
----------------------------------------------------------------------
Dockerfile | 31 +++++++++++++++++++++++++++++++
README.md | 10 +++++++++-
2 files changed, 40 insertions(+), 1 deletion(-)
----------------------------------------------------------------------