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:35 UTC
[11/12] brooklyn-dist git commit: bump to v0.11.0 and remove debug
file
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