Merge pull request #17 from vuongxuongminh/3.x [skip ci].

Update doc and clean chart helper [skip ci].
vuongxuongminh · Apr 30, 2021 · a716b72 · a716b72
2 parents c820004 + 9d83bd6
commit a716b72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -29,8 +29,8 @@ This starts the following services:
 
 | Name          |           Description                                               | Ports | Environments |
 |---------------|---------------------------------------------------------------------|------ |--------------|
-| fpm           | FastCGI process manager with PHP-FPM 7.4.12, Composer.              | n/a   | all          |
-| nginx         | Reverse proxy handle request with NGINX 1.17                        | 80    | all          |
+| fpm           | FastCGI process manager with PHP-FPM, Composer.              | n/a   | all          |
+| nginx         | Reverse proxy handle request with NGINX                        | 80    | all          |
 | setup         | Setup service help run migration & install Composer package         | n/a   | dev          |
 
 This results in the following running containers:

diff --git a/helm-chart/templates/_helpers.tpl b/helm-chart/templates/_helpers.tpl
@@ -31,16 +31,10 @@ chart: {{ .Chart.Name }}
 app: "{{ template "name" . }}"
 {{- end -}}
 
-{{/* matchLabels */}}
-{{- define "matchLabels" -}}
-release: {{ .Release.Name }}
-app: "{{ template "name" . }}"
-{{- end -}}
-
 {{- define "fpm" -}}
-  {{- printf "%s-fpm" (include "fullname" .) -}}
+fpm
 {{- end -}}
 
 {{- define "nginx" -}}
-  {{- printf "%s-nginx" (include "fullname" .) -}}
+nginx
 {{- end -}}