fix(vikunja): different ports between proxy and frontend (#2520)

This commit is contained in:
Stavros Kois
2022-04-20 06:11:52 +00:00
committed by GitHub
parent 7bf8b4979a
commit 829c6e5f57
3 changed files with 9 additions and 6 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ maintainers:
name: vikunja name: vikunja
sources: sources:
- https://vikunja.io/docs - https://vikunja.io/docs
version: 0.0.5 version: 0.0.6
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- productivity - productivity
@@ -8,10 +8,10 @@ metadata:
data: data:
nginx-config: |- nginx-config: |-
server { server {
listen 80; listen 8080;
location / { location / {
proxy_pass http://localhost:80; proxy_pass http://localhost:8081;
} }
location ~* ^/(api|dav|\.well-known)/ { location ~* ^/(api|dav|\.well-known)/ {
+6 -3
View File
@@ -29,7 +29,7 @@ env:
VIKUNJA_DATABASE_DATABASE: "{{ .Values.postgresql.postgresDatabase }}" VIKUNJA_DATABASE_DATABASE: "{{ .Values.postgresql.postgresDatabase }}"
VIKUNJA_SERVICE_TIMEZONE: "{{ .Values.TZ }}" VIKUNJA_SERVICE_TIMEZONE: "{{ .Values.TZ }}"
# User Defined # User Defined
VIKUNJA_SERVICE_FRONTENDURL: "http://localhost:80" VIKUNJA_SERVICE_FRONTENDURL: "http://localhost:8080"
VIKUNJA_SERVICE_JWTTTL: 259200 VIKUNJA_SERVICE_JWTTTL: 259200
VIKUNJA_SERVICE_JWTTTLLONG: 2592000 VIKUNJA_SERVICE_JWTTTLLONG: 2592000
VIKUNJA_SERVICE_MAXITEMSPERPAGE: 50 VIKUNJA_SERVICE_MAXITEMSPERPAGE: 50
@@ -74,17 +74,20 @@ service:
ports: ports:
main: main:
port: 10220 port: 10220
targetPort: 80 targetPort: 8080
additionalContainers: additionalContainers:
frontend: frontend:
name: frontend name: frontend
image: "{{ .Values.frontendImage.repository }}:{{ .Values.frontendImage.tag }}" image: "{{ .Values.frontendImage.repository }}:{{ .Values.frontendImage.tag }}"
env:
- name: VIKUNJA_HTTP_PORT
value: 8081
proxy: proxy:
name: proxy name: proxy
image: "{{ .Values.nginxImage.repository }}:{{ .Values.nginxImage.tag }}" image: "{{ .Values.nginxImage.repository }}:{{ .Values.nginxImage.tag }}"
ports: ports:
- containerPort: 80 - containerPort: 8080
name: main name: main
volumeMounts: volumeMounts:
- name: vikunja-config - name: vikunja-config