From a0493a73e62796f93ed1359dc0570ff0e44d586e Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 12 Oct 2016 23:02:11 +0530 Subject: [PATCH 01/15] use CircleCI to build and deploy releases on multiple targets --- bitnami/jasperreports/circle.yml | 57 ++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 bitnami/jasperreports/circle.yml diff --git a/bitnami/jasperreports/circle.yml b/bitnami/jasperreports/circle.yml new file mode 100644 index 000000000000..485a8b431a55 --- /dev/null +++ b/bitnami/jasperreports/circle.yml @@ -0,0 +1,57 @@ +machine: + services: + - docker + environment: + IMAGE_NAME: jasperserver + DOCKER_PROJECT: bitnami + GCLOUD_PROJECT: bitnami-containers + +dependencies: + override: + - docker info + - gcloud version + - docker pull $DOCKER_PROJECT/$IMAGE_NAME:development || true + +test: + override: + - docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_BUILD_NUM . + +deployment: + development: + branch: master + commands: + - > + if [ -n $DOCKER_PASS ]; then + docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:development . + docker push $DOCKER_PROJECT/$IMAGE_NAME:development + fi + - > + if [ -n $GCLOUD_SERVICE_KEY ]; then + echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json + gcloud auth activate-service-account --key-file ${HOME}/gcloud-service-key.json + gcloud config set project $GCLOUD_PROJECT + docker tag $DOCKER_PROJECT/$IMAGE_NAME:development gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:development + gcloud docker -- push gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:development + fi + release: + tag: /^[0-9]+(\.[0-9]+)*-r[0-9]*/ + commands: + - > + if [ -n $DOCKER_PASS ]; then + docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG . + docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG $DOCKER_PROJECT/$IMAGE_NAME:latest + docker push $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG + docker push $DOCKER_PROJECT/$IMAGE_NAME:latest + fi + - > + if [ -n $GCLOUD_SERVICE_KEY ]; then + echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json + gcloud auth activate-service-account --key-file ${HOME}/gcloud-service-key.json + gcloud config set project $GCLOUD_PROJECT + docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG + docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:latest + gcloud docker -- push gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG + gcloud docker -- push gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:latest + fi From b4dc6981e8df38d374e5aeeba3ea5a9b70bfe68a Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 13 Oct 2016 14:32:49 +0530 Subject: [PATCH 02/15] replace development build with a cache build --- bitnami/jasperreports/circle.yml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/bitnami/jasperreports/circle.yml b/bitnami/jasperreports/circle.yml index 485a8b431a55..454bcd3e8594 100644 --- a/bitnami/jasperreports/circle.yml +++ b/bitnami/jasperreports/circle.yml @@ -10,32 +10,24 @@ dependencies: override: - docker info - gcloud version - - docker pull $DOCKER_PROJECT/$IMAGE_NAME:development || true + - docker pull $DOCKER_PROJECT/$IMAGE_NAME:cache-reload || true test: override: - docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_BUILD_NUM . deployment: - development: + cache: branch: master commands: - > if [ -n $DOCKER_PASS ]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:development . - docker push $DOCKER_PROJECT/$IMAGE_NAME:development - fi - - > - if [ -n $GCLOUD_SERVICE_KEY ]; then - echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json - gcloud auth activate-service-account --key-file ${HOME}/gcloud-service-key.json - gcloud config set project $GCLOUD_PROJECT - docker tag $DOCKER_PROJECT/$IMAGE_NAME:development gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:development - gcloud docker -- push gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:development + docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:cache-reload . + docker push $DOCKER_PROJECT/$IMAGE_NAME:cache-reload fi release: - tag: /^[0-9]+(\.[0-9]+)*-r[0-9]*/ + tag: /^[0-9]+(\.[0-9]+)*([^\n])*/ commands: - > if [ -n $DOCKER_PASS ]; then @@ -49,7 +41,6 @@ deployment: if [ -n $GCLOUD_SERVICE_KEY ]; then echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json gcloud auth activate-service-account --key-file ${HOME}/gcloud-service-key.json - gcloud config set project $GCLOUD_PROJECT docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:latest gcloud docker -- push gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG From 2c89b7ce32b63d969c3b0c59bbf2619f823ffdde Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 13 Oct 2016 20:25:38 +0530 Subject: [PATCH 03/15] fix: BITNAMI_APP_VERSION script macro has been renamed to BITNAMI_IMAGE_VERSION --- bitnami/jasperreports/Dockerfile | 2 +- bitnami/jasperreports/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bitnami/jasperreports/Dockerfile b/bitnami/jasperreports/Dockerfile index d630168ca4c8..3d8713ff5ae4 100644 --- a/bitnami/jasperreports/Dockerfile +++ b/bitnami/jasperreports/Dockerfile @@ -3,7 +3,7 @@ FROM gcr.io/stacksmith-images/ubuntu:14.04-r10 MAINTAINER Bitnami ENV BITNAMI_APP_NAME=jasperserver \ - BITNAMI_APP_VERSION=6.3.0-r2 \ + BITNAMI_IMAGE_VERSION=6.3.0-r2 \ PATH=/opt/bitnami/tomcat/bin:/opt/bitnami/mysql/bin/:$PATH # Additional modules required diff --git a/bitnami/jasperreports/README.md b/bitnami/jasperreports/README.md index 6b9609275006..435b98b75db2 100644 --- a/bitnami/jasperreports/README.md +++ b/bitnami/jasperreports/README.md @@ -225,7 +225,7 @@ be sure to include the following information in your issue: - Host OS and version - Docker version (`docker version`) - Output of `docker info` -- Version of this container (`echo $BITNAMI_APP_VERSION` inside the container) +- Version of this container (`echo $BITNAMI_IMAGE_VERSION` inside the container) - The command you used to run the container, and any relevant output you saw (masking any sensitive information) From 8d26a46f19a2259c956f6b26528946a8952e5a63 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 13 Oct 2016 22:41:43 +0530 Subject: [PATCH 04/15] add circle ci status badge to the readme --- bitnami/jasperreports/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/bitnami/jasperreports/README.md b/bitnami/jasperreports/README.md index 435b98b75db2..7c8645764763 100644 --- a/bitnami/jasperreports/README.md +++ b/bitnami/jasperreports/README.md @@ -1,3 +1,4 @@ +[![CircleCI](https://circleci.com/gh/bitnami/bitnami-docker-jasperserver/tree/master.svg?style=shield)](https://circleci.com/gh/bitnami/bitnami-docker-jasperserver/tree/master) [![Docker Hub Automated Build](http://container.checkforupdates.com/badges/bitnami/jasperserver)](https://hub.docker.com/r/bitnami/jasperserver/) # What is JasperReports? From d1a4d7dd24801cb5f0acd93be6ef71b6173ecac3 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Fri, 14 Oct 2016 10:49:08 +0530 Subject: [PATCH 05/15] circle.yml: renamed cache build to `_` --- bitnami/jasperreports/circle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitnami/jasperreports/circle.yml b/bitnami/jasperreports/circle.yml index 454bcd3e8594..a4427d65af9d 100644 --- a/bitnami/jasperreports/circle.yml +++ b/bitnami/jasperreports/circle.yml @@ -10,7 +10,7 @@ dependencies: override: - docker info - gcloud version - - docker pull $DOCKER_PROJECT/$IMAGE_NAME:cache-reload || true + - docker pull $DOCKER_PROJECT/$IMAGE_NAME:_ || true test: override: @@ -23,8 +23,8 @@ deployment: - > if [ -n $DOCKER_PASS ]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:cache-reload . - docker push $DOCKER_PROJECT/$IMAGE_NAME:cache-reload + docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:_ . + docker push $DOCKER_PROJECT/$IMAGE_NAME:_ fi release: tag: /^[0-9]+(\.[0-9]+)*([^\n])*/ From 204e40270cc7d79de68ff506379eb072af7d630c Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Fri, 14 Oct 2016 10:49:08 +0530 Subject: [PATCH 06/15] circle.yml: simplify deployment tag selection --- bitnami/jasperreports/circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/jasperreports/circle.yml b/bitnami/jasperreports/circle.yml index a4427d65af9d..269e4e2ace1d 100644 --- a/bitnami/jasperreports/circle.yml +++ b/bitnami/jasperreports/circle.yml @@ -27,7 +27,7 @@ deployment: docker push $DOCKER_PROJECT/$IMAGE_NAME:_ fi release: - tag: /^[0-9]+(\.[0-9]+)*([^\n])*/ + tag: /^[0-9.]+/ commands: - > if [ -n $DOCKER_PASS ]; then From 1e14ebc26a2a26fc28f88bec8c49682fc443f833 Mon Sep 17 00:00:00 2001 From: Adnan Abdulhussein Date: Fri, 14 Oct 2016 11:31:20 -0700 Subject: [PATCH 07/15] Fix CircleCI tag regex --- bitnami/jasperreports/circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/jasperreports/circle.yml b/bitnami/jasperreports/circle.yml index 269e4e2ace1d..0ef2bb714944 100644 --- a/bitnami/jasperreports/circle.yml +++ b/bitnami/jasperreports/circle.yml @@ -27,7 +27,7 @@ deployment: docker push $DOCKER_PROJECT/$IMAGE_NAME:_ fi release: - tag: /^[0-9.]+/ + tag: /^[0-9].*/ commands: - > if [ -n $DOCKER_PASS ]; then From 5767ea89bb1c3c6b16e8a9efb828c93470bece71 Mon Sep 17 00:00:00 2001 From: Adnan Abdulhussein Date: Fri, 14 Oct 2016 15:21:41 -0700 Subject: [PATCH 08/15] Set origin for GCR releases --- bitnami/jasperreports/circle.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bitnami/jasperreports/circle.yml b/bitnami/jasperreports/circle.yml index 0ef2bb714944..996c4b68b8e8 100644 --- a/bitnami/jasperreports/circle.yml +++ b/bitnami/jasperreports/circle.yml @@ -41,8 +41,9 @@ deployment: if [ -n $GCLOUD_SERVICE_KEY ]; then echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json gcloud auth activate-service-account --key-file ${HOME}/gcloud-service-key.json - docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG - docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:latest + echo 'ENV BITNAMI_CONTAINER_ORIGIN=GCR' >> Dockerfile + docker build --rm=false -t gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG . + docker tag gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:latest gcloud docker -- push gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG gcloud docker -- push gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:latest fi From a35bcf557431139a2cf1d443b6f4fc5cdcb66a89 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Mon, 17 Oct 2016 13:24:55 +0530 Subject: [PATCH 09/15] ci: quote variables in bash conditional statements --- bitnami/jasperreports/circle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitnami/jasperreports/circle.yml b/bitnami/jasperreports/circle.yml index 996c4b68b8e8..c23c570fdfcc 100644 --- a/bitnami/jasperreports/circle.yml +++ b/bitnami/jasperreports/circle.yml @@ -21,7 +21,7 @@ deployment: branch: master commands: - > - if [ -n $DOCKER_PASS ]; then + if [ -n "$DOCKER_PASS" ]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:_ . docker push $DOCKER_PROJECT/$IMAGE_NAME:_ @@ -30,7 +30,7 @@ deployment: tag: /^[0-9].*/ commands: - > - if [ -n $DOCKER_PASS ]; then + if [ -n "$DOCKER_PASS" ]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG . docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG $DOCKER_PROJECT/$IMAGE_NAME:latest @@ -38,7 +38,7 @@ deployment: docker push $DOCKER_PROJECT/$IMAGE_NAME:latest fi - > - if [ -n $GCLOUD_SERVICE_KEY ]; then + if [ -n "$GCLOUD_SERVICE_KEY" ]; then echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json gcloud auth activate-service-account --key-file ${HOME}/gcloud-service-key.json echo 'ENV BITNAMI_CONTAINER_ORIGIN=GCR' >> Dockerfile From 96643f35cf4bf9b5c23ce5b3d67eda647f3f8dc3 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Mon, 17 Oct 2016 13:24:55 +0530 Subject: [PATCH 10/15] ci: enforce stricter tagging rules --- bitnami/jasperreports/circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/jasperreports/circle.yml b/bitnami/jasperreports/circle.yml index c23c570fdfcc..6f47402fe874 100644 --- a/bitnami/jasperreports/circle.yml +++ b/bitnami/jasperreports/circle.yml @@ -27,7 +27,7 @@ deployment: docker push $DOCKER_PROJECT/$IMAGE_NAME:_ fi release: - tag: /^[0-9].*/ + tag: /^[0-9].*-r[0-9]+$/ commands: - > if [ -n "$DOCKER_PASS" ]; then From b2403cf7dc253c30235cb39512bf1ce852e078fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez?= Date: Wed, 19 Oct 2016 14:08:02 +0200 Subject: [PATCH 11/15] Fix indentation to show numbered list --- bitnami/jasperreports/README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bitnami/jasperreports/README.md b/bitnami/jasperreports/README.md index 7c8645764763..a1566a54fa87 100644 --- a/bitnami/jasperreports/README.md +++ b/bitnami/jasperreports/README.md @@ -112,9 +112,9 @@ Bitnami provides up-to-date versions of JasperReports, including security patche 1. Get the updated images: -``` -$ docker pull bitnami/jasperserver:latest -``` + ``` + $ docker pull bitnami/jasperserver:latest + ``` 2. Stop your container @@ -198,14 +198,14 @@ This would be an example of SMTP configuration using a GMail account: To backup your application data follow these steps: 1. Stop the running container: -* For docker-compose: `$ docker-compose stop jasperserver` -* For manual execution: `$ docker stop jasperserver` + * For docker-compose: `$ docker-compose stop jasperserver` + * For manual execution: `$ docker stop jasperserver` 2. Copy the JasperReports data folder in the host: -``` -$ docker cp /your/local/path/bitnami:/bitnami/jasperserver -``` + ``` + $ docker cp /your/local/path/bitnami:/bitnami/jasperserver + ``` # Restoring a backup From 0fdc845531ed8628716aa7337fc473efb80063c4 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 27 Oct 2016 15:51:54 +0530 Subject: [PATCH 12/15] switch to `gcr.io/stacksmith-images/minideb:jessie-r0` --- bitnami/jasperreports/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/jasperreports/Dockerfile b/bitnami/jasperreports/Dockerfile index 3d8713ff5ae4..ca373019be94 100644 --- a/bitnami/jasperreports/Dockerfile +++ b/bitnami/jasperreports/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/stacksmith-images/ubuntu:14.04-r10 +FROM gcr.io/stacksmith-images/minideb:jessie-r0 MAINTAINER Bitnami From 45dd1102f14c766dc903bdae643a05946c685891 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 27 Oct 2016 22:29:12 +0530 Subject: [PATCH 13/15] switch to `gcr.io/stacksmith-images/minideb:jessie-r1` --- bitnami/jasperreports/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/jasperreports/Dockerfile b/bitnami/jasperreports/Dockerfile index ca373019be94..889b7533f094 100644 --- a/bitnami/jasperreports/Dockerfile +++ b/bitnami/jasperreports/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/stacksmith-images/minideb:jessie-r0 +FROM gcr.io/stacksmith-images/minideb:jessie-r1 MAINTAINER Bitnami From 18f07e651cba2b1af6b3e8d9b680f7cd5d816a35 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Fri, 28 Oct 2016 15:52:59 +0530 Subject: [PATCH 14/15] switch to `gcr.io/stacksmith-images/minideb:jessie-r2` --- bitnami/jasperreports/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/jasperreports/Dockerfile b/bitnami/jasperreports/Dockerfile index 889b7533f094..7b5bea25cad2 100644 --- a/bitnami/jasperreports/Dockerfile +++ b/bitnami/jasperreports/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/stacksmith-images/minideb:jessie-r1 +FROM gcr.io/stacksmith-images/minideb:jessie-r2 MAINTAINER Bitnami From 492a258cb43dc7912a8d0d25eaa81aa20011a1f8 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 2 Nov 2016 19:53:30 +0530 Subject: [PATCH 15/15] bump image version to 6.3.0-r3 --- bitnami/jasperreports/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/jasperreports/Dockerfile b/bitnami/jasperreports/Dockerfile index 7b5bea25cad2..05c6f52b6bd9 100644 --- a/bitnami/jasperreports/Dockerfile +++ b/bitnami/jasperreports/Dockerfile @@ -3,7 +3,7 @@ FROM gcr.io/stacksmith-images/minideb:jessie-r2 MAINTAINER Bitnami ENV BITNAMI_APP_NAME=jasperserver \ - BITNAMI_IMAGE_VERSION=6.3.0-r2 \ + BITNAMI_IMAGE_VERSION=6.3.0-r3 \ PATH=/opt/bitnami/tomcat/bin:/opt/bitnami/mysql/bin/:$PATH # Additional modules required