[3/3] brooklyn git commit: This closes #22
This closes #22 Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/bd0f52c3 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/bd0f52c3 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/bd0f52c3 Branch: refs/heads/master Commit: bd0f52c3bf790f3e3cc9d01b2fb7fa7facb15c99 Parents: 2610f68 5122c6d Author: Aled Sage Authored: Thu Sep 27 10:43:43 2018 +0100 Committer: Aled Sage Committed: Thu Sep 27 10:43:43 2018 +0100 -- Jenkinsfile | 4 ++-- README.md | 6 -- 2 files changed, 6 insertions(+), 4 deletions(-) --
[1/3] brooklyn git commit: jenkins: fix user.name in docker
Repository: brooklyn
Updated Branches:
refs/heads/master 2610f6898 -> bd0f52c3b
jenkins: fix user.name in docker
User 910 is unknown in the docker container, so
`${id -un 910}` does not return a name. We donât
care what user.name it has, as long as there is one.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/c2a3f375
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/c2a3f375
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/c2a3f375
Branch: refs/heads/master
Commit: c2a3f37518278c8a03c738f8ef1d4378fe628d3b
Parents: 2610f68
Author: Aled Sage
Authored: Thu Sep 27 10:40:47 2018 +0100
Committer: Aled Sage
Committed: Thu Sep 27 10:40:47 2018 +0100
--
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn/blob/c2a3f375/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index e06ad4b..f37b75f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ node(label: 'ubuntu') {
stage('Run tests') {
environmentDockerImage.inside('-i --rm --name
brooklyn-${DOCKER_TAG} -u 910:910 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
-sh 'mvn clean install -Duser.home=/var/maven
-Duser.name=$(id -un 910)'
+sh 'mvn clean install -Duser.home=/var/maven
-Duser.name=jenkins'
}
}
@@ -47,7 +47,7 @@ node(label: 'ubuntu') {
if (env.CHANGE_ID == null) {
stage('Deploy artifacts') {
environmentDockerImage.inside('-i --rm --name
brooklyn-${DOCKER_TAG} -u 910:910 --mount
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
-v ${WORKSPACE}:/usr/build -w /usr/build') {
-sh 'mvn deploy -DskipTests -Duser.home=/var/maven
-Duser.name=$(id -un 910)'
+sh 'mvn deploy -DskipTests -Duser.home=/var/maven
-Duser.name=jenkins'
}
}
}
[2/3] brooklyn git commit: README: fix path to built karaf artifact
README: fix path to built karaf artifact Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/5122c6d5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/5122c6d5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/5122c6d5 Branch: refs/heads/master Commit: 5122c6d558465a6254c81fa7c1bcc6b959f6710d Parents: c2a3f37 Author: Aled Sage Authored: Thu Sep 27 10:41:07 2018 +0100 Committer: Aled Sage Committed: Thu Sep 27 10:41:07 2018 +0100 -- README.md | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn/blob/5122c6d5/README.md -- diff --git a/README.md b/README.md index c0dc0ae..5dc1e1a 100644 --- a/README.md +++ b/README.md @@ -49,8 +49,10 @@ docker run -i --rm --name brooklyn -u $(id -u):$(id -g) \ The results are in `brooklyn-dist/dist/target/`, including a tar and a zip. Or to run straight after the build, do: -pushd brooklyn-dist/dist/target/brooklyn-dist/brooklyn/ -bin/brooklyn launch +```bash +pushd brooklyn-dist/karaf/apache-brooklyn/target/assembly/ +./bin/start +``` ### Resources
