Merge remote-tracking branch 'bitnami/master' into jasperserver-persistence-nami

# Conflicts:
#	README.md

bitnami/jasperreports/Dockerfile

@@ -1,9 +1,9 @@
-FROM gcr.io/stacksmith-images/ubuntu:14.04-r10
+FROM gcr.io/stacksmith-images/minideb:jessie-r2
 
 MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_APP_NAME=jasperserver \
-    BITNAMI_APP_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

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?
 
@@ -129,9 +130,15 @@ Bitnami provides up-to-date versions of JasperReports, including security patche
 
 1. Get the updated images:
 
+<<<<<<< HEAD
 ```bash
 $ docker pull bitnami/jasperserver:latest
 ```
+=======
+  ```
+  $ docker pull bitnami/jasperserver:latest
+  ```
+>>>>>>> bitnami/master
 
 2. Stop your container
 
@@ -215,14 +222,20 @@ 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:
 
+<<<<<<< HEAD
 ```bash
 $ docker cp /your/local/path/bitnami:/bitnami/jasperserver
 ```
+=======
+  ```
+  $ docker cp /your/local/path/bitnami:/bitnami/jasperserver
+  ```
+>>>>>>> bitnami/master
 
 # Restoring a backup
 
@@ -243,7 +256,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)
 

bitnami/jasperreports/circle.yml

@@ -0,0 +1,49 @@
+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:_ || true
+
+test:
+  override:
+  - docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_BUILD_NUM .
+
+deployment:
+  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:_ .
+        docker push $DOCKER_PROJECT/$IMAGE_NAME:_
+      fi
+  release:
+    tag: /^[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
+        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