You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2017/02/14 17:05:25 UTC
[01/12] brooklyn-dist git commit: can make docker image,
suitable for standalone use or wrapping as an app quick-launcher
Repository: brooklyn-dist
Updated Branches:
refs/heads/master b6870d885 -> 243fe606a
can make docker image, suitable for standalone use or wrapping as an app quick-launcher
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/5fe99103
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/5fe99103
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/5fe99103
Branch: refs/heads/master
Commit: 5fe9910375c88380dc5e270aaae60e8642cbf2f7
Parents: 058e469
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Oct 31 15:20:58 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Oct 31 15:25:04 2016 +0000
----------------------------------------------------------------------
docker/Dockerfile | 68 ++++++++++++++
docker/Makefile | 43 +++++++++
docker/README.md | 14 +++
docker/brooklyn-docker-start | 184 ++++++++++++++++++++++++++++++++++++++
4 files changed, 309 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5fe99103/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..9ad45f5
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,68 @@
+#
+# 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.
+#
+
+
+FROM ubuntu:latest
+MAINTAINER Alex Heneveld "alex@cloudsoft.io"
+
+RUN apt-get update
+
+# pre-reqs for Brooklyn
+RUN apt-get install -y default-jre
+
+# and for the script
+RUN apt-get install -y ssh
+
+ARG debug
+
+# admin tools (optional)
+RUN if [ -n "${debug}" ] ; then apt-get install -y vim ; fi
+RUN if [ -n "${debug}" ] ; then apt-get install -y zip tar less curl ; fi
+RUN if [ -n "${debug}" ] ; then apt-get install -y sudo ; fi
+
+RUN adduser brooklyn
+WORKDIR /home/brooklyn
+
+COPY target/files/ .
+RUN cp ./bin/br /usr/bin/br
+RUN chown -R brooklyn:brooklyn .
+
+USER brooklyn
+
+# remove option not relevant for java v8
+RUN sed -i.bk "s/ -XX:MaxPermSize=256m//" bin/brooklyn
+
+ARG application
+ARG install_bom
+
+RUN if [ -n "${debug}" ] ; then echo debug=true >> brooklyn-docker-start.opts ; fi
+RUN if [ -n "${application}" ] ; then echo application=${application} >> brooklyn-docker-start.opts ; fi
+
+RUN if [ -n "${install_bom}" ] ; then \
+ echo "brooklyn.catalog:" > conf/brooklyn/default.catalog.bom ; \
+ echo " items:" >> conf/brooklyn/default.catalog.bom ; \
+ for x in ${install_bom} ; do \
+ echo Installing $x to catalog ; \
+ echo " - "$x >> conf/brooklyn/default.catalog.bom ; \
+ done \
+fi
+
+ENTRYPOINT ["bin/brooklyn-docker-start"]
+CMD []
+
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5fe99103/docker/Makefile
----------------------------------------------------------------------
diff --git a/docker/Makefile b/docker/Makefile
new file mode 100644
index 0000000..7d1efa1
--- /dev/null
+++ b/docker/Makefile
@@ -0,0 +1,43 @@
+
+BROOKLYN_VERSION=0.10.0-SNAPSHOT
+
+default: all
+
+clean:
+ rm -rf target/
+
+prep: clean
+ mkdir -p target/files/
+ cp -a ../dist/target/brooklyn-dist/brooklyn/* target/files
+ cp -a target/files/bin/brooklyn-client-cli/linux.386/br target/files/bin/
+ cp -a brooklyn-docker-start target/files/bin/
+
+image-only:
+ docker build -t brooklyncentral/brooklyn:$(BROOKLYN_VERSION) .
+
+image-debug: prep
+ docker build -t brooklyncentral/brooklyn:${BROOKLYN_VERSION} --build-arg debug=true .
+
+all: prep image-only
+
+# copy this if you want to pass arguments
+run:
+ # BROOKLYN_VERSION_BELOW
+ docker run -p 8081:8081 brooklyncentral/brooklyn:0.10.0-SNAPSHOT
+
+run-shell:
+ docker run -ti --entrypoint /bin/bash brooklyncentral/brooklyn:$(BROOKLYN_VERSION)
+
+
+# an example
+
+example-image-hyperledger: prep
+ docker build -t brooklyncentral/brooklyn-hyperledger \
+ --build-arg install_bom="https://raw.githubusercontent.com/cloudsoft/brooklyn-hyperledger/master/docker.bom https://raw.githubusercontent.com/cloudsoft/brooklyn-hyperledger/master/catalog.bom" \
+ --build-arg application=hyperledger-fabric-multi-cluster-application \
+ .
+
+example-run-hyperledger:
+ docker run -p 8081:8081 brooklyncentral/brooklyn-hyperledger
+
+
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5fe99103/docker/README.md
----------------------------------------------------------------------
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 0000000..bec5a9a
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,14 @@
+
+This folder is not part of the build but exists to facilitate making Docker images containing Brooklyn.
+
+To use, with `docker` tools installed, run `make all` after the Brooklyn `dist` has been built.
+Then do `make run` to see the options (or look in [brooklyn-docker-start]()).
+
+When building, you can use:
+
+* `--build-arg debug=true` to install extra tools on the VM and show debug output from our script when booting the container
+* `--build-arg application=my-app` to create a container which boots `my-app` by default
+* `--build-arg install_bom="http://path/to/file.bom http://path/to/another.bom"` to replace the default catalog with one or more BOM files (useful with `application` above)
+
+See examples in the `Makefile`.
+
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5fe99103/docker/brooklyn-docker-start
----------------------------------------------------------------------
diff --git a/docker/brooklyn-docker-start b/docker/brooklyn-docker-start
new file mode 100755
index 0000000..37e046f
--- /dev/null
+++ b/docker/brooklyn-docker-start
@@ -0,0 +1,184 @@
+#!/bin/bash
+
+#
+# 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.
+#
+
+# This script facilitates setting up brooklyn.properties
+# and launching the brooklyn server or the br client as appropriate
+
+# some words/actions treated specially:
+
+# --help shows help on this tool
+# --username and --password set up brooklyn.properties
+# <id...@location> parsed as location and --application appended (if application set?)
+# <word> (not starting with -) passed as command to brooklyn along with everything that follows
+# anything else (blank or options starting -) passed as args to brooklyn launch
+
+function help() {
+ echo
+ # BROOKLYN_VERSION_BELOW
+ echo 'Apache Brooklyn 0.10.0-SNAPSHOT convenience launcher'${application:+" for ${application}"}
+ echo
+ echo 'Usage: [OPTIONS] [--help | LOCATION | COMMAND] [ARGS]'
+ echo
+ echo 'The main argument can be any of:'
+ echo ' --help display this help (or use `help` to show brooklyn help)'
+ if [ -n "$application" ] ; then
+ echo ' LOCATION location to launch '${application:-}', in form ID:CRED@CLOUD'
+ else
+ echo ' LOCATION location to launch APP (requires `--application APP`), in form ID:CRED@CLOUD'
+ fi
+ echo ' COMMAND command to pass to `brooklyn`, default `launch`'
+ echo
+ echo 'If no main argument is specified, `brooklyn launch` is used to start Apache Brooklyn.'
+ echo 'ARGS are passed to the resulting `brooklyn` command. Other OPTIONS available are:'
+ echo ' [ --username USER ] --password PASS set the default [username and] password'
+ echo ' [ --debug ] show additional debug info'
+ if [ -n "$application" ] ; then
+ echo ' [ --application APP ] override the default application to launch ('${application}')'
+ else
+ echo ' [ --application APP ] specify a default application to launch'
+ fi
+ echo
+}
+
+function make_brooklyn_properties() {
+ if [ -n "${brooklyn_properties}" ] ; then return ; fi
+ echo
+ echo Configuring brooklyn.properties...
+ export brooklyn_properties=~/.brooklyn/brooklyn.properties
+ mkdir -p `dirname ${brooklyn_properties}`
+ touch ${brooklyn_properties}
+ chmod 600 ${brooklyn_properties}
+}
+
+if [ -f brooklyn-docker-start.opts ] ; then
+ . ./brooklyn-docker-start.opts
+fi
+
+while [ -n "$1" ] ; do
+ case "$1" in
+
+ --help)
+ help
+ exit 0
+ ;;
+
+ --username | --password | --application)
+ if [ -z "$2" ] ; then
+ echo ERROR: $1 requires an argument following it
+ exit 255
+ fi
+
+ export ${1#--}=$2
+ shift 2
+ continue
+ ;;
+
+ --debug)
+ export ${1#--}=true
+ shift
+ continue
+ ;;
+
+ *:*@*)
+ if [ -z "$application" ] ; then
+ # environment does not support location syntax
+ break
+ fi
+
+ location=$1
+ shift
+ break
+ ;;
+
+ -*)
+ break
+ ;;
+
+ *)
+ command=$1
+ shift
+ break
+ ;;
+
+ esac
+done
+
+if [ -n "$debug" ] ; then
+ set -x # echo all commands
+fi
+
+if [ -n "$password" ] ; then
+ make_brooklyn_properties
+ echo brooklyn.webconsole.security.users=${username:-brooklyn} >> ${brooklyn_properties}
+ echo brooklyn.webconsole.security.user.${username:-brooklyn}.password=${password} >> ${brooklyn_properties}
+ # and set up the config file for `br` so it works
+ echo '{"auth":{"http://localhost:8081":{"password":"'${password}'","username":"'${username:-brooklyn}'"}},"skipSslChecks":false,"target":"http://localhost:8081"}}' > ~/.brooklyn_cli
+
+ echo Created user ${username:-brooklyn} and given password
+
+elif [ -n "$username" ] ; then
+ echo ERROR: password must be specified if providing a username
+ exit 255
+fi
+
+
+if [ ! -f ~/.ssh/id_rsa ] ; then
+ echo
+ echo Creating ssh key to access remote machines...
+ mkdir -p ~/.ssh/
+ chmod 700 ~/.ssh/
+ if [ -n "$debug" ] ; then
+ ssh-keygen -f ~/.ssh/id_rsa -P ""
+ else
+ ssh-keygen -f ~/.ssh/id_rsa -P "" > ~/.ssh/id_rsa.log 2> ~/.ssh/id_rsa.log2
+ fi
+
+ cat ~/.ssh/id_rsa
+fi
+
+
+ARGS=(${command:-launch} $@)
+
+if [[ -n "$application" && -n "$location" ]] ; then
+ echo
+ echo Launching blueprint...
+ creds=${location/@*/}
+ cat > initial.yaml << EOF
+name: $application
+
+services:
+- type: $application
+
+location:
+ ${location/*@/}:
+ identity: ${creds/:*/}
+ credential: ${creds/*:/}
+EOF
+ cat initial.yaml
+ ARGS+=(--app file://`pwd -P`/initial.yaml)
+fi
+
+# launch brooklyn
+echo
+echo Launching '`'brooklyn "${ARGS[@]}"'`'...
+
+. bin/brooklyn "${ARGS[@]}"
+
[11/12] brooklyn-dist git commit: bump to v0.11.0 and remove debug
file
Posted by sv...@apache.org.
bump to v0.11.0 and remove debug file
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/fdedb1e9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/fdedb1e9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/fdedb1e9
Branch: refs/heads/master
Commit: fdedb1e9e425b51a8fb42d499c1c23e70fa663bf
Parents: 214f96e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Feb 14 16:59:52 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Feb 14 16:59:52 2017 +0000
----------------------------------------------------------------------
docker/Dockerfile-debug-ubuntu | 83 -------------------------------------
docker/Makefile | 4 +-
docker/brooklyn-docker-start | 2 +-
3 files changed, 3 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/fdedb1e9/docker/Dockerfile-debug-ubuntu
----------------------------------------------------------------------
diff --git a/docker/Dockerfile-debug-ubuntu b/docker/Dockerfile-debug-ubuntu
deleted file mode 100644
index b129897..0000000
--- a/docker/Dockerfile-debug-ubuntu
+++ /dev/null
@@ -1,83 +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.
-#
-
-
-FROM ubuntu:latest
-# other options: alpine:latest openjdk:8-jre-alpine
-
-MAINTAINER Alex Heneveld "alex@cloudsoft.io"
-
-RUN \
- apt-get update ; \
- apt-get install -y openjdk-8-jre-headless ; \
- # options: openjdk-8-jre-headless default-jre ; \
- apt-get install -y ssh
-
-# debug installs extra things
-ENV debug true
-RUN \
- if [ -n "${debug}" ] ; then \
- apt-get update ; \
- apt-get install -y sudo zip tar less curl vim ; \
- fi
-
-# run as user brooklyn
-RUN adduser brooklyn < /dev/null
-WORKDIR /home/brooklyn
-
-# now install software brooklyn
-COPY target/files/ .
-RUN \
- # remove option not relevan for java v8 \
- sed -i.bk "s/ -XX:MaxPermSize=256m//" bin/brooklyn ; \
- # install br for global use \
- cp ./bin/br /usr/bin/br ; \
- # and fix perms (irritating that docker won't do this) \
- chown -R brooklyn:brooklyn .
-
-USER brooklyn
-
-# handle customisation, including passing args through to the container script and installing boms
-ARG application
-ARG install_boms
-ARG dropins_jars
-RUN \
- if [ -n "${debug}" ] ; then echo debug=true >> brooklyn-docker-start.opts ; fi ; \
- if [ -n "${application}" ] ; then echo application=${application} >> brooklyn-docker-start.opts ; fi ; \
- if [ -n "${install_boms}" ] ; then \
- echo "brooklyn.catalog:" > conf/brooklyn/default.catalog.bom ; \
- echo " items:" >> conf/brooklyn/default.catalog.bom ; \
- for x in ${install_boms} ; do \
- echo Installing $x to catalog ; \
- echo " - "$x >> conf/brooklyn/default.catalog.bom ; \
- done ; \
- fi ; \
- if [ -n "${dropins_jars}" ] ; then \
- cd lib/dropins/ ; \
- for x in ${dropins_jars} ; do \
- echo Download $x to lib/dropins ; \
- wget -q --trust-server-names $x ; \
- done ; \
- fi
-
-# and start
-EXPOSE 8081
-ENTRYPOINT ["bin/brooklyn-docker-start"]
-CMD []
-
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/fdedb1e9/docker/Makefile
----------------------------------------------------------------------
diff --git a/docker/Makefile b/docker/Makefile
index 047c471..d916db4 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -17,7 +17,7 @@
# under the License.
#
-BROOKLYN_VERSION=0.10.0-SNAPSHOT
+BROOKLYN_VERSION=0.11.0-SNAPSHOT
default: all
@@ -44,7 +44,7 @@ all: prep image-only
run:
# BROOKLYN_VERSION_BELOW
- docker run -d -p 8081:8081 brooklyncentral/brooklyn:0.10.0-SNAPSHOT --password S3CR3T > /tmp/brooklyn_container
+ docker run -d -p 8081:8081 brooklyncentral/brooklyn:${BROOKLYN_VERSION} --password S3CR3T > /tmp/brooklyn_container
docker logs -f `cat /tmp/brooklyn_container`
run-shell:
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/fdedb1e9/docker/brooklyn-docker-start
----------------------------------------------------------------------
diff --git a/docker/brooklyn-docker-start b/docker/brooklyn-docker-start
index 23e193d..33cf08d 100755
--- a/docker/brooklyn-docker-start
+++ b/docker/brooklyn-docker-start
@@ -33,7 +33,7 @@
function help() {
echo
# BROOKLYN_VERSION_BELOW
- echo 'Apache Brooklyn 0.10.0-SNAPSHOT convenience launcher'${application:+" for ${application}"}
+ echo 'Apache Brooklyn 0.11.0-SNAPSHOT convenience launcher'${application:+" for ${application}"}
echo
echo 'Usage: [OPTIONS] [--help | LOCATION | COMMAND] [ARGS]'
echo
[03/12] brooklyn-dist git commit: declare that 8081 should be exposed
Posted by sv...@apache.org.
declare that 8081 should be exposed
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/2f797c50
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/2f797c50
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/2f797c50
Branch: refs/heads/master
Commit: 2f797c506ab83725824943afcfc9cdbbfd7aa6fd
Parents: 6a47cf2
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Nov 2 13:43:37 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Nov 2 13:43:37 2016 +0000
----------------------------------------------------------------------
docker/Dockerfile | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/2f797c50/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3fa689a..3cd709f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -53,6 +53,7 @@ RUN \
fi
# and start
+EXPOSE 8081
ENTRYPOINT ["bin/brooklyn-docker-start"]
CMD []
[08/12] brooklyn-dist git commit: remove dev random tweak -- doesn't
work as /dev/ isn't persisted
Posted by sv...@apache.org.
remove dev random tweak -- doesn't work as /dev/ isn't persisted
and haveged also fails as /proc/ is readonly; you just have to make sure your host has entropy
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/7bb6dad9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/7bb6dad9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/7bb6dad9
Branch: refs/heads/master
Commit: 7bb6dad9d9c14e5e80ec02481bf8ebd15cd2dd9c
Parents: 5311938
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Nov 9 10:33:25 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Nov 9 10:33:25 2016 +0000
----------------------------------------------------------------------
docker/Dockerfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/7bb6dad9/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d5d8d67..91d3973 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,8 +21,7 @@
FROM openjdk:8-jre-alpine
MAINTAINER Alex Heneveld "alex@cloudsoft.io"
-RUN apk add --update --no-cache bash openssh wget ; \
- mv /dev/random /dev/random-real && ln -s /dev/urandom /dev/random
+RUN apk add --update --no-cache bash openssh wget
RUN adduser -D brooklyn
WORKDIR /home/brooklyn
[07/12] brooklyn-dist git commit: add support for specifying dropins
Posted by sv...@apache.org.
add support for specifying dropins
and tweak arg names
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/53119381
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/53119381
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/53119381
Branch: refs/heads/master
Commit: 53119381e0561bf63efe08300189945426feeba8
Parents: 15cd83f
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 8 20:29:10 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Nov 8 20:58:21 2016 +0000
----------------------------------------------------------------------
docker/Dockerfile | 18 +++++++++++++-----
docker/Dockerfile-debug-ubuntu | 17 +++++++++++++----
docker/Makefile | 2 +-
docker/README.md | 3 ++-
4 files changed, 29 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/53119381/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0b17c72..d5d8d67 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,7 +21,7 @@
FROM openjdk:8-jre-alpine
MAINTAINER Alex Heneveld "alex@cloudsoft.io"
-RUN apk add --update --no-cache bash openssh ; \
+RUN apk add --update --no-cache bash openssh wget ; \
mv /dev/random /dev/random-real && ln -s /dev/urandom /dev/random
RUN adduser -D brooklyn
WORKDIR /home/brooklyn
@@ -40,17 +40,25 @@ USER brooklyn
# handle customisation, including passing args through to the container script and installing boms
ARG application
-ARG install_bom
+ARG install_boms
+ARG dropins_jars
RUN \
if [ -n "${debug}" ] ; then echo debug=true >> brooklyn-docker-start.opts ; fi ; \
if [ -n "${application}" ] ; then echo application=${application} >> brooklyn-docker-start.opts ; fi ; \
- if [ -n "${install_bom}" ] ; then \
+ if [ -n "${install_boms}" ] ; then \
echo "brooklyn.catalog:" > conf/brooklyn/default.catalog.bom ; \
echo " items:" >> conf/brooklyn/default.catalog.bom ; \
- for x in ${install_bom} ; do \
+ for x in ${install_boms} ; do \
echo Installing $x to catalog ; \
echo " - "$x >> conf/brooklyn/default.catalog.bom ; \
- done \
+ done ; \
+ fi ; \
+ if [ -n "${dropins_jars}" ] ; then \
+ cd lib/dropins/ ; \
+ for x in ${dropins_jars} ; do \
+ echo Download $x to lib/dropins ; \
+ wget -q --trust-server-names $x ; \
+ done ; \
fi
# and start
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/53119381/docker/Dockerfile-debug-ubuntu
----------------------------------------------------------------------
diff --git a/docker/Dockerfile-debug-ubuntu b/docker/Dockerfile-debug-ubuntu
index 683a90e..b129897 100644
--- a/docker/Dockerfile-debug-ubuntu
+++ b/docker/Dockerfile-debug-ubuntu
@@ -55,20 +55,29 @@ USER brooklyn
# handle customisation, including passing args through to the container script and installing boms
ARG application
-ARG install_bom
+ARG install_boms
+ARG dropins_jars
RUN \
if [ -n "${debug}" ] ; then echo debug=true >> brooklyn-docker-start.opts ; fi ; \
if [ -n "${application}" ] ; then echo application=${application} >> brooklyn-docker-start.opts ; fi ; \
- if [ -n "${install_bom}" ] ; then \
+ if [ -n "${install_boms}" ] ; then \
echo "brooklyn.catalog:" > conf/brooklyn/default.catalog.bom ; \
echo " items:" >> conf/brooklyn/default.catalog.bom ; \
- for x in ${install_bom} ; do \
+ for x in ${install_boms} ; do \
echo Installing $x to catalog ; \
echo " - "$x >> conf/brooklyn/default.catalog.bom ; \
- done \
+ done ; \
+ fi ; \
+ if [ -n "${dropins_jars}" ] ; then \
+ cd lib/dropins/ ; \
+ for x in ${dropins_jars} ; do \
+ echo Download $x to lib/dropins ; \
+ wget -q --trust-server-names $x ; \
+ done ; \
fi
# and start
+EXPOSE 8081
ENTRYPOINT ["bin/brooklyn-docker-start"]
CMD []
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/53119381/docker/Makefile
----------------------------------------------------------------------
diff --git a/docker/Makefile b/docker/Makefile
index 9cdd87c..2f0957a 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -55,7 +55,7 @@ run-shell:
example-image-hyperledger: prep
docker build -t brooklyncentral/brooklyn-hyperledger \
- --build-arg install_bom="https://raw.githubusercontent.com/cloudsoft/brooklyn-hyperledger/master/docker.bom https://raw.githubusercontent.com/cloudsoft/brooklyn-hyperledger/master/catalog.bom" \
+ --build-arg install_boms="https://raw.githubusercontent.com/cloudsoft/brooklyn-hyperledger/master/docker.bom https://raw.githubusercontent.com/cloudsoft/brooklyn-hyperledger/master/catalog.bom" \
--build-arg application=hyperledger-fabric-single-cluster-application \
.
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/53119381/docker/README.md
----------------------------------------------------------------------
diff --git a/docker/README.md b/docker/README.md
index bec5a9a..273fdb7 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -8,7 +8,8 @@ When building, you can use:
* `--build-arg debug=true` to install extra tools on the VM and show debug output from our script when booting the container
* `--build-arg application=my-app` to create a container which boots `my-app` by default
-* `--build-arg install_bom="http://path/to/file.bom http://path/to/another.bom"` to replace the default catalog with one or more BOM files (useful with `application` above)
+* `--build-arg install_boms="http://path/to/file.bom http://path/to/another.bom"` to replace the default catalog with one or more BOM files (useful with `application` above)
+* `--build-arg dropins_jars="http://path/to/file.jar http://path/to/another.jar"` to add JARs in the dropins dir (useful with `application` and `install_boms` above)
See examples in the `Makefile`.
[09/12] brooklyn-dist git commit: add k8s example showing
`dropins_jars`
Posted by sv...@apache.org.
add k8s example showing `dropins_jars`
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/5346fbbf
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/5346fbbf
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/5346fbbf
Branch: refs/heads/master
Commit: 5346fbbfa44aec33076aaf37668ac03629a8ce29
Parents: 7bb6dad
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Nov 9 11:26:15 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Nov 9 11:26:15 2016 +0000
----------------------------------------------------------------------
docker/Makefile | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5346fbbf/docker/Makefile
----------------------------------------------------------------------
diff --git a/docker/Makefile b/docker/Makefile
index 2f0957a..047c471 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -55,7 +55,8 @@ run-shell:
example-image-hyperledger: prep
docker build -t brooklyncentral/brooklyn-hyperledger \
- --build-arg install_boms="https://raw.githubusercontent.com/cloudsoft/brooklyn-hyperledger/master/docker.bom https://raw.githubusercontent.com/cloudsoft/brooklyn-hyperledger/master/catalog.bom" \
+ --build-arg install_boms="https://raw.githubusercontent.com/cloudsoft/brooklyn-hyperledger/master/docker.bom \
+ https://raw.githubusercontent.com/cloudsoft/brooklyn-hyperledger/master/catalog.bom" \
--build-arg application=hyperledger-fabric-single-cluster-application \
.
@@ -63,4 +64,13 @@ example-run-hyperledger:
# add id:cred@cloud as an argument to launch the blueprint in that cloud
docker run -p 8081:8081 brooklyncentral/brooklyn-hyperledger --password S3CR3T
+example-image-kubernetes: prep
+ docker build -t brooklyncentral/brooklyn-kubernetes \
+ --build-arg install_boms="classpath://swarm/catalog.bom classpath://kubernetes/catalog.bom" \
+ --build-arg dropins_jars="https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn.etcd&a=brooklyn-etcd&v=2.3.0-SNAPSHOT \
+ https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn.clocker&a=clocker-common&v=2.1.0-SNAPSHOT \
+ https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn.clocker&a=clocker-swarm&v=2.1.0-SNAPSHOT \
+ https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn.clocker&a=clocker-kubernetes&v=2.1.0-SNAPSHOT" \
+ --build-arg application=kubernetes-cluster-template \
+ .
[04/12] brooklyn-dist git commit: obfuscate credential in output
Posted by sv...@apache.org.
obfuscate credential in output
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/69713b2b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/69713b2b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/69713b2b
Branch: refs/heads/master
Commit: 69713b2b653ff59ea086393a6214df531f722dde
Parents: 2f797c5
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Nov 2 13:43:54 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Nov 2 13:43:54 2016 +0000
----------------------------------------------------------------------
docker/brooklyn-docker-start | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/69713b2b/docker/brooklyn-docker-start
----------------------------------------------------------------------
diff --git a/docker/brooklyn-docker-start b/docker/brooklyn-docker-start
index 37e046f..23e193d 100755
--- a/docker/brooklyn-docker-start
+++ b/docker/brooklyn-docker-start
@@ -172,7 +172,7 @@ location:
identity: ${creds/:*/}
credential: ${creds/*:/}
EOF
- cat initial.yaml
+ cat initial.yaml | sed 's/\(.*credential:\).*/\1 <suppressed>/'
ARGS+=(--app file://`pwd -P`/initial.yaml)
fi
[12/12] brooklyn-dist git commit: Closes #56
Posted by sv...@apache.org.
Closes #56
[READY FOR REVIEW] docker image, for standalone or quick-launch
see the README
super-easy way to launch brooklyn or even package a special brooklyn for a specific blueprint
everything seems to be working except the HL blueprint needs to refer to the single cluster example
note this is already pushed to docker hub so you can experiment on the runs without checking anything out :)
@grkvlt @mikezaccardo @shartzel welcome any comments
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/243fe606
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/243fe606
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/243fe606
Branch: refs/heads/master
Commit: 243fe606a83586c2a1a5d125608782fa0b274b69
Parents: b6870d8 fdedb1e
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Feb 14 19:04:41 2017 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Feb 14 19:04:41 2017 +0200
----------------------------------------------------------------------
docker/Dockerfile | 67 ++++++++++++++
docker/Makefile | 76 ++++++++++++++++
docker/README.md | 15 ++++
docker/brooklyn-docker-start | 184 ++++++++++++++++++++++++++++++++++++++
pom.xml | 1 +
5 files changed, 343 insertions(+)
----------------------------------------------------------------------
[02/12] brooklyn-dist git commit: switched to alpine
Posted by sv...@apache.org.
switched to alpine
working alpine and ubuntu images:
REPOSITORY TAG IMAGE ID CREATED SIZE
brooklyncentral/brooklyn 0.10.0-SNAPSHOT-debug b062efb658b5 4 minutes ago 570.8 MB
brooklyncentral/brooklyn 0.10.0-SNAPSHOT 9530e7fa762c 10 minutes ago 288.2 MB
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/6a47cf24
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/6a47cf24
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/6a47cf24
Branch: refs/heads/master
Commit: 6a47cf24090a97b2e1ac8c768b33afa2cd8c0c25
Parents: 5fe9910
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 1 18:13:17 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Nov 1 18:13:17 2016 +0000
----------------------------------------------------------------------
docker/Dockerfile | 60 +++++++++++++-----------------
docker/Dockerfile-debug-ubuntu | 74 +++++++++++++++++++++++++++++++++++++
docker/Makefile | 17 ++++++---
3 files changed, 110 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/6a47cf24/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9ad45f5..3fa689a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,51 +18,41 @@
#
-FROM ubuntu:latest
+FROM openjdk:8-jre-alpine
MAINTAINER Alex Heneveld "alex@cloudsoft.io"
-RUN apt-get update
-
-# pre-reqs for Brooklyn
-RUN apt-get install -y default-jre
-
-# and for the script
-RUN apt-get install -y ssh
-
-ARG debug
-
-# admin tools (optional)
-RUN if [ -n "${debug}" ] ; then apt-get install -y vim ; fi
-RUN if [ -n "${debug}" ] ; then apt-get install -y zip tar less curl ; fi
-RUN if [ -n "${debug}" ] ; then apt-get install -y sudo ; fi
-
-RUN adduser brooklyn
+RUN apk add --update bash openssh && rm -rf /var/cache/apk/*
+RUN adduser -D brooklyn
WORKDIR /home/brooklyn
+# now install software brooklyn
COPY target/files/ .
-RUN cp ./bin/br /usr/bin/br
-RUN chown -R brooklyn:brooklyn .
+RUN \
+ # remove option not relevan for java v8 \
+ sed -i.bk "s/ -XX:MaxPermSize=256m//" bin/brooklyn ; \
+ # install br for global use \
+ cp ./bin/br /usr/bin/br ; \
+ # and fix perms (irritating that docker won't do this) \
+ chown -R brooklyn:brooklyn .
USER brooklyn
-# remove option not relevant for java v8
-RUN sed -i.bk "s/ -XX:MaxPermSize=256m//" bin/brooklyn
-
+# handle customisation, including passing args through to the container script and installing boms
ARG application
ARG install_bom
-
-RUN if [ -n "${debug}" ] ; then echo debug=true >> brooklyn-docker-start.opts ; fi
-RUN if [ -n "${application}" ] ; then echo application=${application} >> brooklyn-docker-start.opts ; fi
-
-RUN if [ -n "${install_bom}" ] ; then \
- echo "brooklyn.catalog:" > conf/brooklyn/default.catalog.bom ; \
- echo " items:" >> conf/brooklyn/default.catalog.bom ; \
- for x in ${install_bom} ; do \
- echo Installing $x to catalog ; \
- echo " - "$x >> conf/brooklyn/default.catalog.bom ; \
- done \
-fi
-
+RUN \
+ if [ -n "${debug}" ] ; then echo debug=true >> brooklyn-docker-start.opts ; fi ; \
+ if [ -n "${application}" ] ; then echo application=${application} >> brooklyn-docker-start.opts ; fi ; \
+ if [ -n "${install_bom}" ] ; then \
+ echo "brooklyn.catalog:" > conf/brooklyn/default.catalog.bom ; \
+ echo " items:" >> conf/brooklyn/default.catalog.bom ; \
+ for x in ${install_bom} ; do \
+ echo Installing $x to catalog ; \
+ echo " - "$x >> conf/brooklyn/default.catalog.bom ; \
+ done \
+ fi
+
+# and start
ENTRYPOINT ["bin/brooklyn-docker-start"]
CMD []
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/6a47cf24/docker/Dockerfile-debug-ubuntu
----------------------------------------------------------------------
diff --git a/docker/Dockerfile-debug-ubuntu b/docker/Dockerfile-debug-ubuntu
new file mode 100644
index 0000000..683a90e
--- /dev/null
+++ b/docker/Dockerfile-debug-ubuntu
@@ -0,0 +1,74 @@
+#
+# 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.
+#
+
+
+FROM ubuntu:latest
+# other options: alpine:latest openjdk:8-jre-alpine
+
+MAINTAINER Alex Heneveld "alex@cloudsoft.io"
+
+RUN \
+ apt-get update ; \
+ apt-get install -y openjdk-8-jre-headless ; \
+ # options: openjdk-8-jre-headless default-jre ; \
+ apt-get install -y ssh
+
+# debug installs extra things
+ENV debug true
+RUN \
+ if [ -n "${debug}" ] ; then \
+ apt-get update ; \
+ apt-get install -y sudo zip tar less curl vim ; \
+ fi
+
+# run as user brooklyn
+RUN adduser brooklyn < /dev/null
+WORKDIR /home/brooklyn
+
+# now install software brooklyn
+COPY target/files/ .
+RUN \
+ # remove option not relevan for java v8 \
+ sed -i.bk "s/ -XX:MaxPermSize=256m//" bin/brooklyn ; \
+ # install br for global use \
+ cp ./bin/br /usr/bin/br ; \
+ # and fix perms (irritating that docker won't do this) \
+ chown -R brooklyn:brooklyn .
+
+USER brooklyn
+
+# handle customisation, including passing args through to the container script and installing boms
+ARG application
+ARG install_bom
+RUN \
+ if [ -n "${debug}" ] ; then echo debug=true >> brooklyn-docker-start.opts ; fi ; \
+ if [ -n "${application}" ] ; then echo application=${application} >> brooklyn-docker-start.opts ; fi ; \
+ if [ -n "${install_bom}" ] ; then \
+ echo "brooklyn.catalog:" > conf/brooklyn/default.catalog.bom ; \
+ echo " items:" >> conf/brooklyn/default.catalog.bom ; \
+ for x in ${install_bom} ; do \
+ echo Installing $x to catalog ; \
+ echo " - "$x >> conf/brooklyn/default.catalog.bom ; \
+ done \
+ fi
+
+# and start
+ENTRYPOINT ["bin/brooklyn-docker-start"]
+CMD []
+
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/6a47cf24/docker/Makefile
----------------------------------------------------------------------
diff --git a/docker/Makefile b/docker/Makefile
index 7d1efa1..c53d6fe 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -16,28 +16,33 @@ image-only:
docker build -t brooklyncentral/brooklyn:$(BROOKLYN_VERSION) .
image-debug: prep
- docker build -t brooklyncentral/brooklyn:${BROOKLYN_VERSION} --build-arg debug=true .
+ # image based on ubuntu (instead of alpine) with more tools installed and better debug output
+ docker build -t brooklyncentral/brooklyn:${BROOKLYN_VERSION}-debug -f Dockerfile-debug-ubuntu .
all: prep image-only
-# copy this if you want to pass arguments
+
+# illustrations, useful for copy-pasting
+
run:
# BROOKLYN_VERSION_BELOW
- docker run -p 8081:8081 brooklyncentral/brooklyn:0.10.0-SNAPSHOT
+ docker run -d -p 8081:8081 brooklyncentral/brooklyn:0.10.0-SNAPSHOT --password S3CR3T > /tmp/brooklyn_container
+ docker logs -f `cat /tmp/brooklyn_container`
run-shell:
docker run -ti --entrypoint /bin/bash brooklyncentral/brooklyn:$(BROOKLYN_VERSION)
-# an example
+# an example pre-installing blueprints and even taking a location as argument to quick launch
example-image-hyperledger: prep
docker build -t brooklyncentral/brooklyn-hyperledger \
--build-arg install_bom="https://raw.githubusercontent.com/cloudsoft/brooklyn-hyperledger/master/docker.bom https://raw.githubusercontent.com/cloudsoft/brooklyn-hyperledger/master/catalog.bom" \
- --build-arg application=hyperledger-fabric-multi-cluster-application \
+ --build-arg application=hyperledger-fabric-single-cluster-application \
.
example-run-hyperledger:
- docker run -p 8081:8081 brooklyncentral/brooklyn-hyperledger
+ # add id:cred@cloud as an argument to launch the blueprint in that cloud
+ docker run -p 8081:8081 brooklyncentral/brooklyn-hyperledger --password S3CR3T
[05/12] brooklyn-dist git commit: fix RAT problems
Posted by sv...@apache.org.
fix RAT problems
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/62aa4c3d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/62aa4c3d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/62aa4c3d
Branch: refs/heads/master
Commit: 62aa4c3d54a183a7f3549c838eb1423e9b705a8b
Parents: 69713b2
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Nov 7 11:26:01 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Nov 7 11:26:01 2016 +0000
----------------------------------------------------------------------
docker/Makefile | 18 ++++++++++++++++++
pom.xml | 1 +
2 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/62aa4c3d/docker/Makefile
----------------------------------------------------------------------
diff --git a/docker/Makefile b/docker/Makefile
index c53d6fe..9cdd87c 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,3 +1,21 @@
+#
+# 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.
+#
BROOKLYN_VERSION=0.10.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/62aa4c3d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 61a51e9..b95eb7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,7 @@
<configuration>
<excludes combine.children="append">
<exclude>scripts/README.md</exclude>
+ <exclude>docker/README.md</exclude>
</excludes>
</configuration>
</plugin>
[10/12] brooklyn-dist git commit: Merge branch 'master' into docker
Posted by sv...@apache.org.
Merge branch 'master' into docker
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/214f96e7
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/214f96e7
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/214f96e7
Branch: refs/heads/master
Commit: 214f96e7e6881c86fd2a2056d97803dc55aec285
Parents: 5346fbb b6870d8
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Feb 14 16:57:41 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Feb 14 16:57:41 2017 +0000
----------------------------------------------------------------------
.mvn/jvm.config | 1 +
LICENSE | 21 +-
all/pom.xml | 2 +-
archetypes/quickstart/NOTES.txt | 2 +-
archetypes/quickstart/pom.xml | 2 +-
.../quickstart/src/brooklyn-sample/pom.xml | 2 +-
deb-packaging/pom.xml | 2 +-
dist/licensing/.gitignore | 1 +
dist/licensing/README.md | 19 +-
dist/licensing/extras-files | 1 -
dist/licensing/licenses/brooklyn-client/ASL2 | 177 ---
.../licenses/brooklyn-client/BSD-3-Clause | 27 -
dist/licensing/licenses/brooklyn-client/MIT | 20 -
dist/licensing/licenses/cli/ASL2 | 177 +++
dist/licensing/licenses/cli/BSD-3-Clause | 27 +
dist/licensing/licenses/cli/MIT | 20 +
dist/licensing/overrides.yaml | 31 +-
dist/licensing/projects-with-custom-licenses | 2 +-
dist/pom.xml | 2 +-
dist/src/main/dist/bin/brooklyn | 3 +
dist/src/main/dist/bin/brooklyn.bat | 1 +
dist/src/main/license/files/LICENSE | 84 +-
downstream-parent/pom.xml | 5 +-
karaf/apache-brooklyn/pom.xml | 55 +-
.../apache-brooklyn/src/main/resources/LICENSE | 1468 ++++++++++++++++++
karaf/apache-brooklyn/src/main/resources/NOTICE | 5 +
.../src/main/resources/bin/setenv | 37 +-
.../src/main/resources/etc/default.catalog.bom | 2 +-
....apache.brooklyn.core.catalog.bomscanner.cfg | 27 -
.../etc/org.apache.brooklyn.osgilauncher.cfg | 65 -
.../src/main/resources/etc/system.properties | 9 -
karaf/config/pom.xml | 62 +
.../org.apache.brooklyn.classrename.cfg | 21 +
....apache.brooklyn.core.catalog.bomscanner.cfg | 27 +
.../org.apache.brooklyn.osgilauncher.cfg | 67 +
karaf/features/pom.xml | 4 +-
karaf/features/src/main/feature/feature.xml | 26 +-
karaf/itest/pom.xml | 2 +-
.../java/org/apache/brooklyn/AssemblyTest.java | 1 -
.../catalog/internal/CatalogBomScannerTest.java | 3 -
.../launcher/osgi/OsgiLauncherTest.java | 18 +-
.../security/CustomSecurityProviderTest.java | 1 +
.../security/StockSecurityProviderTest.java | 1 +
karaf/pom.xml | 12 +-
pom.xml | 2 +-
release/Vagrantfile | 11 +-
release/clone-and-configure-repos.sh | 4 +-
release/make-release-artifacts.sh | 17 +-
release/print-vote-email.sh | 17 +-
release/settings.xml | 14 +
release/verify_brooklyn_rc.sh | 200 +++
rpm-packaging/pom.xml | 2 +-
scripts/am | 98 ++
shared-packaging/pom.xml | 2 +-
.../resources/service/systemd/brooklyn.service | 2 +-
.../resources/service/upstart/deb/brooklyn.conf | 2 +-
.../resources/service/upstart/rpm/brooklyn.conf | 2 +-
.../src/test/yaml/package-apps.yaml | 8 +-
shared-packaging/src/test/yaml/package.bom | 2 +-
vagrant/pom.xml | 2 +-
vagrant/src/main/vagrant/LICENSE | 202 +++
vagrant/src/main/vagrant/NOTICE | 5 +
vagrant/src/main/vagrant/README.md | 4 +-
.../src/main/vagrant/files/install_brooklyn.sh | 2 +-
.../src/main/vagrant/files/vagrant-catalog.bom | 10 +-
vagrant/src/main/vagrant/servers.yaml | 32 +-
66 files changed, 2725 insertions(+), 457 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/214f96e7/pom.xml
----------------------------------------------------------------------
[06/12] brooklyn-dist git commit: "fix" entropy,
and use `--no-cache` for alpine as suggested by @neykov
Posted by sv...@apache.org.
"fix" entropy, and use `--no-cache` for alpine as suggested by @neykov
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/15cd83f3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/15cd83f3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/15cd83f3
Branch: refs/heads/master
Commit: 15cd83f3358bd6200744a41b6e4779eaa66ea54c
Parents: 62aa4c3
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 8 19:23:06 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Nov 8 19:23:06 2016 +0000
----------------------------------------------------------------------
docker/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/15cd83f3/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3cd709f..0b17c72 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,7 +21,8 @@
FROM openjdk:8-jre-alpine
MAINTAINER Alex Heneveld "alex@cloudsoft.io"
-RUN apk add --update bash openssh && rm -rf /var/cache/apk/*
+RUN apk add --update --no-cache bash openssh ; \
+ mv /dev/random /dev/random-real && ln -s /dev/urandom /dev/random
RUN adduser -D brooklyn
WORKDIR /home/brooklyn