Skip to content
Snippets Groups Projects
Commit 394a6b9e authored by Remi  PLANEL's avatar Remi PLANEL
Browse files

Merge branch 'dev' into structure-db-with-molstar

parents da4a391f 546c82f6
No related branches found
No related tags found
1 merge request!131Merge relevant Abstract and references
Pipeline #117826 failed
...@@ -211,6 +211,8 @@ lint: ...@@ -211,6 +211,8 @@ lint:
update update
--file data/all_predictions_statistics.csv --file data/all_predictions_statistics.csv
--document structure --document structure
allow_failure: false
update-meilisearch-index:dev: update-meilisearch-index:dev:
rules: rules:
...@@ -249,6 +251,7 @@ update-meilisearch-index:prod: ...@@ -249,6 +251,7 @@ update-meilisearch-index:prod:
artifacts: artifacts:
reports: reports:
dotenv: build.env dotenv: build.env
allow_failure: false
set-meili-env:dev: set-meili-env:dev:
......
apiVersion: v1
kind: ConfigMap
metadata:
name: nginx-config
data:
default.conf: |
server {
listen 8080;
server_name localhost;
location /wiki {
alias /etc/nginx/html/;
index index.html index.htm;
try_files $uri $uri/ $uri/index.html /index.html =404;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
alias /etc/nginx/html/;
}
}
\ No newline at end of file
...@@ -49,6 +49,13 @@ spec: ...@@ -49,6 +49,13 @@ spec:
port: http port: http
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- mountPath: /tmp
name: tmp
- name: nginx-config
mountPath: /etc/nginx/conf.d/
{{- with .Values.nodeSelector }} {{- with .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
...@@ -61,3 +68,10 @@ spec: ...@@ -61,3 +68,10 @@ spec:
tolerations: tolerations:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
volumes:
- emptyDir: {}
name: tmp
- name: nginx-config
configMap:
name: nginx-config
...@@ -4,7 +4,7 @@ image: ...@@ -4,7 +4,7 @@ image:
ingress: ingress:
enabled: false enabled: false
annotations: annotations:
- kubernetes.io/ingress.class: internal - kubernetes.io/ingress.class: external
hosts: hosts:
- host: chart-example.local - host: chart-example.local
paths: paths:
......
...@@ -3,7 +3,7 @@ meilisearch: ...@@ -3,7 +3,7 @@ meilisearch:
MEILI_MASTER_KEY: "MASTER_KEY" MEILI_MASTER_KEY: "MASTER_KEY"
ingress: ingress:
enabled: true enabled: true
className: internal className: external
annotations: annotations:
nginx.ingress.kubernetes.io/proxy-body-size: 100m nginx.ingress.kubernetes.io/proxy-body-size: 100m
hosts: hosts:
......
...@@ -2,7 +2,7 @@ server_tokens off; ...@@ -2,7 +2,7 @@ server_tokens off;
server { server {
listen 8080; listen 8080;
server_name localhost; server_name localhost;
location /wiki/ { location /wiki {
alias /etc/nginx/html/; alias /etc/nginx/html/;
index index.html index.htm; index index.html index.htm;
try_files $uri $uri/ $uri/index.html /index.html; try_files $uri $uri/ $uri/index.html /index.html;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment