Merge branch 'official-element-image' into 'master'

README.md

@@ -64,7 +64,3 @@ element:
 ```
 
 For a list of the settings allowed in `homeserverConfig`, check out [Synapse's own documentation](https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html).
-
-# Why do you use a custom Element image?
-
-The official Element image, [`docker.io/vectorim/element-web`](https://hub.docker.com/r/vectorim/element-web), runs as root and is only built for a few architectures. The [image](https://github.com/users/remram44/packages/container/package/matrix-helm%2Felement) in this repo (`element/`) is built from [`docker.io/nginxinc/nginx-unprivileged`](https://hub.docker.com/r/nginxinc/nginx-unprivileged).

charts/element/Chart.yaml

@@ -4,7 +4,7 @@ description: A chart for Element, the web interface for Matrix.org.
 
 type: application
 
-version: "1.0.62"
+version: "1.1.0"
 
 # The version of Element
-appVersion: "1.11.89"
+appVersion: "1.11.90"

charts/element/templates/deployment.yaml

@@ -31,10 +31,13 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: ELEMENT_WEB_PORT
+              value: "8080"
           volumeMounts:
-            - mountPath: /usr/lib/element/config.json
+            - mountPath: /app/config.json
               name: config
               subPath: config.json
               readOnly: true

charts/element/values.yaml

@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: ghcr.io/remram44/matrix-helm/element
+  repository: docker.io/vectorim/element-web
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""