mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-26 00:55:10 +00:00
fix: improve resources and readme
This commit is contained in:
parent
f4d0affd44
commit
5cacf65887
10 changed files with 10 additions and 22 deletions
|
|
@ -26,8 +26,8 @@ Notes:
|
||||||
Cert Manager can be used to automate Letsencrypt certificate management.
|
Cert Manager can be used to automate Letsencrypt certificate management.
|
||||||
During Creation of new ingress, cert-manager annotations are used.
|
During Creation of new ingress, cert-manager annotations are used.
|
||||||
|
|
||||||
[Installation](https://cert-manager.io/docs/installation/kubernetes/)
|
- [Installation](https://cert-manager.io/docs/installation/kubernetes/)
|
||||||
[Configure Issuer](https://cert-manager.io/docs/installation/kubernetes/#configuring-your-first-issuer)
|
- [Configure Issuer](https://cert-manager.io/docs/installation/kubernetes/#configuring-your-first-issuer)
|
||||||
|
|
||||||
## Prepare MariaDB
|
## Prepare MariaDB
|
||||||
|
|
||||||
|
|
@ -147,7 +147,7 @@ kubectl create namespace erpnext
|
||||||
helm repo add erpnext https://helm.erpnext.com/repo
|
helm repo add erpnext https://helm.erpnext.com/repo
|
||||||
helm repo update
|
helm repo update
|
||||||
|
|
||||||
helm install frappe-bench-0001 --namespace erpnext-v12 erpnext \
|
helm install frappe-bench-0001 --namespace erpnext erpnext-v12 \
|
||||||
--set mariadbHost=mariadb.mariadb.svc.cluster.local \
|
--set mariadbHost=mariadb.mariadb.svc.cluster.local \
|
||||||
--set persistence.storageClass=rook-cephfs
|
--set persistence.storageClass=rook-cephfs
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -32,13 +32,7 @@ spec:
|
||||||
- name: sites-dir
|
- name: sites-dir
|
||||||
mountPath: /home/frappe/frappe-bench/sites
|
mountPath: /home/frappe/frappe-bench/sites
|
||||||
imagePullPolicy: {{ .Values.pythonImage.pullPolicy }}
|
imagePullPolicy: {{ .Values.pythonImage.pullPolicy }}
|
||||||
command: ["docker-entrypoint.sh"]
|
|
||||||
args: ["schedule"]
|
args: ["schedule"]
|
||||||
{{ if .Values.runAsRoot }}
|
|
||||||
env:
|
|
||||||
- name: "RUN_AS_ROOT"
|
|
||||||
value: "1"
|
|
||||||
{{ end }}
|
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ spec:
|
||||||
- name: sites-dir
|
- name: sites-dir
|
||||||
mountPath: /home/frappe/frappe-bench/sites
|
mountPath: /home/frappe/frappe-bench/sites
|
||||||
imagePullPolicy: {{ .Values.pythonImage.pullPolicy }}
|
imagePullPolicy: {{ .Values.pythonImage.pullPolicy }}
|
||||||
command: ["docker-entrypoint.sh"]
|
|
||||||
args: ["worker"]
|
args: ["worker"]
|
||||||
env:
|
env:
|
||||||
- name: "WORKER_TYPE"
|
- name: "WORKER_TYPE"
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ spec:
|
||||||
- name: sites-dir
|
- name: sites-dir
|
||||||
mountPath: /home/frappe/frappe-bench/sites
|
mountPath: /home/frappe/frappe-bench/sites
|
||||||
imagePullPolicy: {{ .Values.pythonImage.pullPolicy }}
|
imagePullPolicy: {{ .Values.pythonImage.pullPolicy }}
|
||||||
command: ["docker-entrypoint.sh"]
|
|
||||||
args: ["worker"]
|
args: ["worker"]
|
||||||
env:
|
env:
|
||||||
- name: "WORKER_TYPE"
|
- name: "WORKER_TYPE"
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ spec:
|
||||||
- name: sites-dir
|
- name: sites-dir
|
||||||
mountPath: /home/frappe/frappe-bench/sites
|
mountPath: /home/frappe/frappe-bench/sites
|
||||||
imagePullPolicy: {{ .Values.pythonImage.pullPolicy }}
|
imagePullPolicy: {{ .Values.pythonImage.pullPolicy }}
|
||||||
command: ["docker-entrypoint.sh"]
|
|
||||||
args: ["worker"]
|
args: ["worker"]
|
||||||
env:
|
env:
|
||||||
- name: "WORKER_TYPE"
|
- name: "WORKER_TYPE"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
apiVersion: batch/v1
|
apiVersion: batch/v1
|
||||||
kind: Job
|
kind: Job
|
||||||
metadata:
|
metadata:
|
||||||
name: migrate-sites-1587307712
|
name: migrate-sites-{{ template "erpnext.fullname" . }}-{{ date "20060102150405" .Release.Time }}
|
||||||
spec:
|
spec:
|
||||||
backoffLimit: 1
|
backoffLimit: 1
|
||||||
template:
|
template:
|
||||||
|
|
@ -11,8 +11,8 @@ spec:
|
||||||
supplementalGroups: [1000]
|
supplementalGroups: [1000]
|
||||||
containers:
|
containers:
|
||||||
- name: erpnext
|
- name: erpnext
|
||||||
image: frappe/erpnext-worker:v12
|
image: "{{ .Values.pythonImage.repository }}:{{ .Values.pythonImage.tag }}"
|
||||||
command: ["migrate"]
|
args: ["migrate"]
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: sites-dir
|
- name: sites-dir
|
||||||
|
|
@ -21,6 +21,6 @@ spec:
|
||||||
volumes:
|
volumes:
|
||||||
- name: sites-dir
|
- name: sites-dir
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: erpnext-v12
|
claimName: {{ template "erpnext.fullname" . }}
|
||||||
readOnly: false
|
readOnly: false
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
|
||||||
|
|
@ -33,9 +33,6 @@ imagePullSecrets: []
|
||||||
nameOverride: ""
|
nameOverride: ""
|
||||||
fullnameOverride: ""
|
fullnameOverride: ""
|
||||||
|
|
||||||
# Run workers, scheduler and web as root
|
|
||||||
runAsRoot: false
|
|
||||||
|
|
||||||
serviceAccount:
|
serviceAccount:
|
||||||
# Specifies whether a service account should be created
|
# Specifies whether a service account should be created
|
||||||
create: true
|
create: true
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ spec:
|
||||||
containers:
|
containers:
|
||||||
- name: erpnext
|
- name: erpnext
|
||||||
image: frappe/erpnext-worker:${VERSION}
|
image: frappe/erpnext-worker:${VERSION}
|
||||||
command: "backup"
|
args: ["backup"]
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: "WITH_FILES"
|
- name: "WITH_FILES"
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ spec:
|
||||||
containers:
|
containers:
|
||||||
- name: erpnext
|
- name: erpnext
|
||||||
image: frappe/erpnext-worker:${VERSION}
|
image: frappe/erpnext-worker:${VERSION}
|
||||||
command: "migrate"
|
args: ["migrate"]
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: sites-dir
|
- name: sites-dir
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ spec:
|
||||||
containers:
|
containers:
|
||||||
- name: erpnext
|
- name: erpnext
|
||||||
image: frappe/erpnext-worker:${VERSION}
|
image: frappe/erpnext-worker:${VERSION}
|
||||||
command: "new"
|
args: ["new"]
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: sites-dir
|
- name: sites-dir
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue