mirror of
https://github.com/bitnami/charts.git
synced 2026-03-07 08:07:55 +08:00
Merge pull request #736 from bitnami/nginx-bash
Do not use volume for Nginx by default. Do not ship default SSL certs
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
name: nginx
|
||||
version: 0.5.4
|
||||
version: 0.6.0
|
||||
appVersion: 1.14.0
|
||||
description: Chart for the nginx server
|
||||
keywords:
|
||||
|
||||
@@ -76,7 +76,7 @@ _custom-vhost.yaml_
|
||||
```yaml
|
||||
vhost: |-
|
||||
server {
|
||||
listen 0.0.0.0:80;
|
||||
listen 0.0.0.0:8080;
|
||||
location / {
|
||||
return 200 "hello!";
|
||||
}
|
||||
|
||||
@@ -30,8 +30,6 @@ spec:
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: 8080
|
||||
- name: https
|
||||
containerPort: 8443
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /
|
||||
@@ -47,15 +45,11 @@ spec:
|
||||
timeoutSeconds: 3
|
||||
periodSeconds: 5
|
||||
volumeMounts:
|
||||
- name: nginx-data
|
||||
mountPath: /bitnami/nginx
|
||||
{{- if .Values.vhost }}
|
||||
- name: nginx-vhost
|
||||
mountPath: /bitnami/nginx/conf/vhosts
|
||||
mountPath: /opt/bitnami/nginx/conf/vhosts
|
||||
{{- end }}
|
||||
volumes:
|
||||
- name: nginx-data
|
||||
emptyDir: {}
|
||||
{{- if .Values.vhost }}
|
||||
- name: nginx-vhost
|
||||
configMap:
|
||||
|
||||
@@ -13,8 +13,5 @@ spec:
|
||||
- name: http
|
||||
port: 80
|
||||
targetPort: http
|
||||
- name: https
|
||||
port: 443
|
||||
targetPort: https
|
||||
selector:
|
||||
app: {{ template "fullname" . }}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: bitnami/nginx
|
||||
tag: 1.14.0-ol-7
|
||||
tag: 1.14.0
|
||||
## Specify a imagePullPolicy
|
||||
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
|
||||
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
|
||||
@@ -25,7 +25,7 @@ serviceType: LoadBalancer
|
||||
# vhost: |-
|
||||
# # example PHP-FPM vhost
|
||||
# server {
|
||||
# listen 0.0.0.0:80;
|
||||
# listen 0.0.0.0:8080;
|
||||
# root /app;
|
||||
# location / {
|
||||
# index index.html index.php;
|
||||
|
||||
Reference in New Issue
Block a user