8.5.15-r0 release

Adding support for release series 8.5

bitnami/tomcat/8.5/Dockerfile

@@ -0,0 +1,27 @@
+FROM bitnami/minideb-extras:jessie-r15
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
+# Install required system packages and dependencies
+RUN install_packages libc6 libexpat1 libffi6 libfontconfig1 libfreetype6 libgcc1 libglib2.0-0 liblzma5 libpcre3 libpng12-0 libselinux1 libstdc++6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 zlib1g
+RUN bitnami-pkg install java-1.8.0_121-0 --checksum 2743f753fd1ea88bf90352d95694f89ab0a0fb855cf0d1c7b2a6d92835f9ad27
+RUN bitnami-pkg unpack tomcat-8.5.15-0 --checksum 92f4ee0f4e8511e7271d0e3e4a2ad3095a2a512aa6d46ba193da7a3c45f07d47
+RUN ln -sf /opt/bitnami/tomcat/data /app
+
+COPY rootfs /
+
+ENV BITNAMI_APP_NAME="tomcat" \
+    BITNAMI_IMAGE_VERSION="8.5.15-r0" \
+    JAVA_OPTS="-Djava.awt.headless=true -XX:+UseG1GC -Dfile.encoding=UTF-8" \
+    PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:$PATH" \
+    TOMCAT_AJP_PORT="8009" \
+    TOMCAT_ALLOW_REMOTE_MANAGEMENT="0" \
+    TOMCAT_HTTP_PORT="8080" \
+    TOMCAT_SHUTDOWN_PORT="8005" \
+    TOMCAT_USERNAME="user"
+
+VOLUME ["/bitnami/tomcat"]
+
+EXPOSE 8080
+
+ENTRYPOINT ["/app-entrypoint.sh"]
+CMD ["nami","start","--foreground","tomcat"]

bitnami/tomcat/8.5/docker-compose.yml

@@ -0,0 +1,15 @@
+version: '2'
+
+services:
+  tomcat:
+    image: 'bitnami/tomcat:8.5'
+    labels:
+      kompose.service.type: nodeport
+    ports:
+      - '8080:8080'
+    volumes:
+      - 'tomcat_data:/bitnami/tomcat'
+
+volumes:
+  tomcat_data:
+    driver: local

bitnami/tomcat/8.5/rootfs/app-entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/bash -e
+
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+print_welcome_page
+check_for_updates &
+
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+  nami_initialize tomcat
+  info "Starting tomcat... "
+fi
+
+exec tini -- "$@"

bitnami/tomcat/8.5/rootfs/tomcat-inputs.json

@@ -0,0 +1,7 @@
+{
+  "ajpPort": "{{$global.env.TOMCAT_AJP_PORT}}",
+  "allowRemoteManagement": "{{$global.env.TOMCAT_ALLOW_REMOTE_MANAGEMENT}}",
+  "httpPort": "{{$global.env.TOMCAT_HTTP_PORT}}",
+  "shutdownPort": "{{$global.env.TOMCAT_SHUTDOWN_PORT}}",
+  "username": "{{$global.env.TOMCAT_USERNAME}}"
+}

bitnami/tomcat/README.md

@@ -26,7 +26,7 @@ services:
 
 ## Kubernetes
 
-> **WARNING**: This is a beta configuration, currently unsupported.
+> **WARNING:** This is a beta configuration, currently unsupported.
 
 Get the raw URL pointing to the kubernetes.yml manifest and use kubectl to create the resources on your Kubernetes cluster like so:
 
@@ -44,9 +44,10 @@ $ kubectl create -f https://raw.githubusercontent.com/bitnami/bitnami-docker-tom
 
 # Supported tags and respective `Dockerfile` links
 
- - [`9.0`, `7.0.77-r0`, `latest` (9.0/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/7.0.77-r0/9.0/Dockerfile)
- - [`8.0`, `7.0.77-r0` (8.0/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/7.0.77-r0/8.0/Dockerfile)
- - [`7`, `7.0.77-r2` (7/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/7.0.77-r2/7/Dockerfile)
+ - [`9.0`, `8.5.15-r0`, `latest` (9.0/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.15-r0/9.0/Dockerfile)
+ - [`8.5`, `8.5.15-r0` (8.5/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.15-r0/8.5/Dockerfile)
+ - [`8.0`, `8.5.15-r0` (8.0/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.15-r0/8.0/Dockerfile)
+ - [`7`, `8.5.15-r0` (7/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.15-r0/7/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/tomcat GitHub repo](https://github.com/bitnami/bitnami-docker-tomcat).
 

bitnami/tomcat/circle.yml

@@ -2,7 +2,7 @@ machine:
   services:
   - docker
   environment:
-    RELEASE_SERIES_LIST: 9.0,8.0,7
+    RELEASE_SERIES_LIST: 9.0,8.5,8.0,7
     LATEST_STABLE: 9.0
     IMAGE_NAME: tomcat
     CHART_NAME: tomcat