tomcat: upgrade to bitnami/tomcat:8.0.35-r0 (#45)

This commit is contained in:
Sameer Naik
2016-06-06 20:12:20 +05:30
committed by Adnan Abdulhussein
parent a7898d0d03
commit f537186208
4 changed files with 18 additions and 21 deletions

View File

@@ -2,7 +2,7 @@ name: tomcat
home: http://tomcat.apache.org
source:
- https://github.com/bitnami/bitnami-docker-tomcat
version: 0.1.0
version: 0.2.0
description: Chart for Apache Tomcat
maintainers:
- Bitnami <containers@bitnami.com>

View File

@@ -10,18 +10,20 @@ spec:
replicas: 1
selector:
provider: tomcat
version: 7.0.68-0
version: 8.0.35-r0
template:
metadata:
labels:
provider: tomcat
version: 7.0.68-0
version: 8.0.35-r0
heritage: bitnami
spec:
containers:
- name: tomcat
image: bitnami/tomcat:7.0.68-0
image: bitnami/tomcat:8.0.35-r0
env:
- name: TOMCAT_USER
value: "user"
- name: TOMCAT_PASSWORD
value: ""
ports:
@@ -40,12 +42,8 @@ spec:
initialDelaySeconds: 5
timeoutSeconds: 1
volumeMounts:
- name: webapps
mountPath: /app
- name: conf
mountPath: /bitnami/tomcat/conf
- name: data
mountPath: /bitnami/tomcat
volumes:
- name: webapps
emptyDir: {}
- name: conf
- name: data
emptyDir: {}

View File

@@ -10,18 +10,20 @@ spec:
replicas: 1
selector:
provider: tomcat
version: 7.0.68-0
version: 8.0.35-r0
template:
metadata:
labels:
provider: tomcat
version: 7.0.68-0
version: 8.0.35-r0
heritage: bitnami
spec:
containers:
- name: tomcat
image: bitnami/tomcat:7.0.68-0
image: bitnami/tomcat:8.0.35-r0
env:
- name: TOMCAT_USER
value: {{ .tomcatUser | quote }}
- name: TOMCAT_PASSWORD
value: {{ .tomcatPassword | quote }}
ports:
@@ -40,12 +42,8 @@ spec:
initialDelaySeconds: 5
timeoutSeconds: 1
volumeMounts:
- name: webapps
mountPath: /app
- name: conf
mountPath: /bitnami/tomcat/conf
- name: data
mountPath: /bitnami/tomcat
volumes:
- name: webapps
emptyDir: {}
- name: conf
- name: data
emptyDir: {}

View File

@@ -1 +1,2 @@
tomcatUser = "user"
tomcatPassword = ""