Skip to content

Commit 38bb836

Browse files
committed
Merge branch 'official-element-image' into 'master'
2 parents deeda74 + 37e0fde commit 38bb836

8 files changed

Lines changed: 8 additions & 116 deletions

File tree

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,3 @@ element:
6464
```
6565
6666
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).
67-
68-
# Why do you use a custom Element image?
69-
70-
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A chart for Element, the web interface for Matrix.org.
44

55
type: application
66

7-
version: "1.0.62"
7+
version: "1.1.0"
88

99
# The version of Element
10-
appVersion: "1.11.89"
10+
appVersion: "1.11.90"

charts/element/templates/deployment.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,13 @@ spec:
3131
- name: {{ .Chart.Name }}
3232
securityContext:
3333
{{- toYaml .Values.securityContext | nindent 12 }}
34-
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
34+
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
3535
imagePullPolicy: {{ .Values.image.pullPolicy }}
36+
env:
37+
- name: ELEMENT_WEB_PORT
38+
value: "8080"
3639
volumeMounts:
37-
- mountPath: /usr/lib/element/config.json
40+
- mountPath: /app/config.json
3841
name: config
3942
subPath: config.json
4043
readOnly: true

charts/element/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
replicaCount: 1
66

77
image:
8-
repository: ghcr.io/remram44/matrix-helm/element
8+
repository: docker.io/vectorim/element-web
99
pullPolicy: IfNotPresent
1010
# Overrides the image tag whose default is the chart appVersion.
1111
tag: ""

element/Dockerfile

Lines changed: 0 additions & 22 deletions
This file was deleted.

element/build.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

element/element.nginx

Lines changed: 0 additions & 20 deletions
This file was deleted.

element/entrypoint.sh

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)