From f58119b4c9d46a4ac3c46eb02b7c614c688d497e Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Thu, 21 May 2020 14:13:16 +0200
Subject: [PATCH] use onlyoffice stock container image
---
templates/onlyoffice-deployment.yaml | 24 +++++++++++++-----------
values.yaml | 7 +++++--
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/templates/onlyoffice-deployment.yaml b/templates/onlyoffice-deployment.yaml
index 87fb8b65..9cfc3951 100644
--- a/templates/onlyoffice-deployment.yaml
+++ b/templates/onlyoffice-deployment.yaml
@@ -27,7 +27,7 @@ spec:
preStop:
exec:
command:
- - "/usr/local/sbin/prepare4shutdown.sh"
+ - "documentserver-prepare4shutdown.sh"
image: "{{ .Values.onlyoffice.image.repository }}:{{ .Values.onlyoffice.image.tag }}"
imagePullPolicy: {{ .Values.onlyoffice.image.pullPolicy }}
{{- if .Values.onlyoffice.livenessProbe.enabled }}
@@ -57,27 +57,29 @@ spec:
failureThreshold: {{ .Values.onlyoffice.readinessProbe.failureThreshold }}
{{- end }}
env:
- - name: RABBITMQ_SERVER_URL
+ - name: AMQP_URI
value: "amqp://user:{{ .Values.rabbitmq.rabbitmq.password }}@{{ .Release.Name }}-rabbitmq:{{ .Values.rabbitmq.service.port }}"
+ - name: JWT_ENABLED
+ value: true
- name: JWT_SECRET
value: "{{ .Values.onlyoffice.jwtSecret }}"
- - name: POSTGRESQL_SERVER_USER
+ - name: DB_USER
value: "onlyoffice"
- - name: REDIS_SERVER_HOST
- value: "{{ .Release.Name }}-redis-master"
- - name: POSTGRESQL_SERVER_PASS
+ - name: DB_PWD
valueFrom:
secretKeyRef:
name: "{{ .Release.Name }}-postgresql"
key: "postgresql-password"
- - name: REDIS_SERVER_PORT
- value: "{{ .Values.redis.master.service.port }}"
- - name: POSTGRESQL_SERVER_HOST
+ - name: DB_HOST
value: "{{ .Release.Name }}-postgresql"
- - name: POSTGRESQL_SERVER_PORT
+ - name: DB_PORT
value: "{{ .Values.postgresql.service.port }}"
- - name: POSTGRESQL_SERVER_DB_NAME
+ - name: DB_NAME
value: "{{ .Values.postgresql.postgresqlDatabase }}"
+ - name: REDIS_SERVER_HOST
+ value: "{{ .Release.Name }}-redis-master"
+ - name: REDIS_SERVER_PORT
+ value: "{{ .Values.redis.master.service.port }}"
- name: SKIP_FONTS_GENERATION
value: "{{ .Values.onlyoffice.skipFontsGeneration }}"
ports:
diff --git a/values.yaml b/values.yaml
index 2d086839..49be25a5 100644
--- a/values.yaml
+++ b/values.yaml
@@ -62,8 +62,11 @@ onlyoffice:
server_name: onlyoffice.domain
image:
- repository: infrarednetwork/onlyoffice-documentserver
- tag: 5.4.1-2
+ # repository: infrarednetwork/onlyoffice-documentserver
+ # tag: 5.4.1-2
+ # pullPolicy: Always
+ repository: onlyoffice/documentserver
+ tag: 5.5.1
pullPolicy: Always
strategy: Recreate
--
GitLab