Run phpmyadmin with non-root user

Signed-off-by: Tamal Saha <[email protected]>
kubedb · Jul 26, 2024 · 5af1ed4 · 5af1ed4
1 parent 9254d87
commit 5af1ed4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/charts/phpmyadmin/README.md b/charts/phpmyadmin/README.md
@@ -54,7 +54,7 @@ The following table lists the configurable parameters of the `phpmyadmin` chart
 | proxies.quay                       | quay.io/company/bin:tag                                                                                                | <code>quay.io</code>                                                                                                                                                                           |
 | proxies.kubernetes                 | registry.k8s.io/bin:tag                                                                                                | <code>registry.k8s.io</code>                                                                                                                                                                   |
 | replicaCount                       |                                                                                                                        | <code>1</code>                                                                                                                                                                                 |
-| image.repository                   |                                                                                                                        | <code>"phpmyadmin"</code>                                                                                                                                                                      |
+| image.repository                   |                                                                                                                        | <code>"appscode-images/phpmyadmin"</code>                                                                                                                                                      |
 | image.pullPolicy                   |                                                                                                                        | <code>Always</code>                                                                                                                                                                            |
 | image.tag                          | Overrides the image tag whose default is the chart appVersion.                                                         | <code>""</code>                                                                                                                                                                                |
 | imagePullSecrets                   |                                                                                                                        | <code>[]</code>                                                                                                                                                                                |

diff --git a/charts/phpmyadmin/templates/deployment.yaml b/charts/phpmyadmin/templates/deployment.yaml
@@ -72,9 +72,11 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: '{{ include "image.dockerLibrary" (merge (dict "_repo" $.Values.image.repository) $) }}:{{ .Values.image.tag | default .Chart.AppVersion }}'
+          image: '{{ include "image.ghcr" (merge (dict "_repo" $.Values.image.repository) $) }}:{{ .Values.image.tag | default .Chart.AppVersion }}'
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
+            - name: APACHE_PORT
+              value: "8080"
             - name: PMA_HOST
               value: "{{ .Values.app.service.name }}.{{ .Values.app.service.namespace }}.svc"
             - name: MYSQL_ROOT_PASSWORD
@@ -84,7 +86,7 @@ spec:
                   key: password
           ports:
             - name: http
-              containerPort: 80
+              containerPort: 8080
               protocol: TCP
           # livenessProbe:
           #   httpGet:

diff --git a/charts/phpmyadmin/values.yaml b/charts/phpmyadmin/values.yaml
@@ -19,7 +19,7 @@ proxies:
 replicaCount: 1
 
 image:
-  repository: "phpmyadmin"
+  repository: "appscode-images/phpmyadmin"
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""