diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..59ca0d6f Binary files /dev/null and b/.DS_Store differ diff --git a/.github/.DS_Store b/.github/.DS_Store new file mode 100644 index 00000000..189950fa Binary files /dev/null and b/.github/.DS_Store differ diff --git a/Caddyfile b/Caddyfile new file mode 100644 index 00000000..b7182131 --- /dev/null +++ b/Caddyfile @@ -0,0 +1,6 @@ +www.dev.com, erp.dev.com { + tls ./certs/_wildcard.dev.com.pem ./certs/_wildcard.dev.com-key.pem + reverse_proxy localhost:8080 + encode gzip + log +} diff --git a/certs/_wildcard.dev.com-key.pem b/certs/_wildcard.dev.com-key.pem new file mode 100644 index 00000000..fa471017 --- /dev/null +++ b/certs/_wildcard.dev.com-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDdQakNDeTPEapy +iuoUuZbCBdPuENOW36WD3ZDxyX+1cLhEGhOpYd6JZ/NHeowQv0mZNYch6prE0cd+ +CtKOGxomSfGJ24dVxKdXhFRIBToAsfQll3/huy+28qV5TJwea5Qf8FvvasTDvFxe +oomjIuTEQetBHQGS4SMgSqF04HHN6U3VmdvjRjMDrbytiM/8gRGjtzCav/DwDBfx +fLiG0R/Hh5qmq+zFu2GEk14vk8Ye8l/bH8JRMdqEWcJrzM10pk55lRjj5qVyLB7A +eLecC2LJott0L/iKTzu3jt/M1Lu2EPXlSKBcz2vvr/zV6SX7KeG5yl2kKtrcvSEy +oztwNuK1AgMBAAECggEAMRIp8xo8v+wUGHlUtyn+FKQEP819j/2kEN3oEqf06gHI +7Fm4OJ3bJDBo1VaJkAFMym0DvnLwxmwcSYkO77N1Fj7aEhAdMNl/n7pakuqN1a+i +DWBPXXoNeA7SwldKXLjRTlAZo7zTTPIOrnJwAj1v7VMNYRCU08WY68WBj5FjzB3j +jB2ngHYvjg3374Z6FJDmoZeQwFtxtf7JjfrZChVuqzLD+mMLXjla/IWVbZKzHUoZ +m9sh2RJ3QohvdlkBSw/3apQYkvB1zv1+p679JiAoX4CJnoUgD4V6fGBnaLl5QCvm +euBqOspuulcS7K6vODZxk68dxgfWBYxEhjmscuqwYQKBgQDhlZW0mE6yxSAzeykC +nMcEQaJpewP7CTKReATD4SPrBhg/rU/dG1xhno+J0FEBVhnfVq6kRZiOeSKaYmz9 +WDqTcrf7dJVv5ykoQ5CaUwIXdH1qDbpthhWaWDodc0QxNTmaK47lwwdBnCOg0WeL +gQSPhG1Zjujpd+RRINtUAtjAvQKBgQD7FrGBBvzI0mbk2Ceo98JzNfnBA4PqdqF0 +WuvPtvJAhwGSkxUfKPDGn9GHWWS/v13HX7TX33S6MYLAAKFSG97JH/zrtrNi9Ufw +tTP5nh4fCvIZlR6dRPo1ARZzCaz34leerNW7LaVoC40ctFKdVQq2TIeGXH10h/Gg +s0kUu/P1WQKBgQCxdP3usn3+Teo19WXegzxgEc3U0ovgGG0qWFLPULXztbivpwQT +eOmkdZqPHEwNFBGISuVZntITCiH5dwIsDhMOWQl4i07fV+ZdoUEI1dHoZ6AdJK2K +aRdnco5NCpcTar5klG12O4TizRSN9w1Qhe7zg4aOFEkPGFyIoaNIJHEktQKBgF2n +qEvlTFKn0ENZsOlgiMIqht8MrZ694xkgdMbEiXWyJc8DV6SIw86CfEgM+vxep98e +/rhqnAJ7RzbQxVt4E9BXQyK0whKOROgu3pUj+j4/+e+65HFq8hzlK/d6y26mmWIR +O6OWshSuAlOLmykeOGGpCAAA7baSonj7hq3aMXP5AoGACOWb4/V9kpv1aDLSNW4H +SFtf7sEWPRnSdDQm8Cqn09vPcYzYG3ZAyYhxpqcXQBrYjNuAxHU4wE14ZU1VkUTd +f7RxRFFhlBYZjo2hjc6vYlQQhOD2HubjcrM83A92OIloUldJ4p6YaCzxyaaD3Yxo +H9JX4JIPUNGLMxjR/nSbe3M= +-----END PRIVATE KEY----- diff --git a/certs/_wildcard.dev.com.pem b/certs/_wildcard.dev.com.pem new file mode 100644 index 00000000..03982f74 --- /dev/null +++ b/certs/_wildcard.dev.com.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIERjCCAq6gAwIBAgIQAh8LRNv1gwx54ZMYmro+DTANBgkqhkiG9w0BAQsFADCB +hTEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMS0wKwYDVQQLDCR4aWFv +bWluZ3dhbmdAMTIwMDQyMyAoWGlhb21pbmcgV2FuZykxNDAyBgNVBAMMK21rY2Vy +dCB4aWFvbWluZ3dhbmdAMTIwMDQyMyAoWGlhb21pbmcgV2FuZykwHhcNMjQxMjEy +MDgwMzUyWhcNMjcwMzEyMDgwMzUyWjBYMScwJQYDVQQKEx5ta2NlcnQgZGV2ZWxv +cG1lbnQgY2VydGlmaWNhdGUxLTArBgNVBAsMJHhpYW9taW5nd2FuZ0AxMjAwNDIz +IChYaWFvbWluZyBXYW5nKTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AN1BqQ0N5M8RqnKK6hS5lsIF0+4Q05bfpYPdkPHJf7VwuEQaE6lh3oln80d6jBC/ +SZk1hyHqmsTRx34K0o4bGiZJ8Ynbh1XEp1eEVEgFOgCx9CWXf+G7L7bypXlMnB5r +lB/wW+9qxMO8XF6iiaMi5MRB60EdAZLhIyBKoXTgcc3pTdWZ2+NGMwOtvK2Iz/yB +EaO3MJq/8PAMF/F8uIbRH8eHmqar7MW7YYSTXi+Txh7yX9sfwlEx2oRZwmvMzXSm +TnmVGOPmpXIsHsB4t5wLYsmi23Qv+IpPO7eO38zUu7YQ9eVIoFzPa++v/NXpJfsp +4bnKXaQq2ty9ITKjO3A24rUCAwEAAaNeMFwwDgYDVR0PAQH/BAQDAgWgMBMGA1Ud +JQQMMAoGCCsGAQUFBwMBMB8GA1UdIwQYMBaAFGjkMQq9pslRBO35UlDbwr1Iyr/o +MBQGA1UdEQQNMAuCCSouZGV2LmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAekCB2UaT +G+GfVt41OBEDk7eu6ZsKq8SyvkypmWfdy41R6zM1/6VyHHkySWIbsXtj4telAXCB ++Q2JFx78PVpwIehXIddM6drtijQpbbuJW4I38eqjA8XZg+nFC1VoUdYIAdV3ZXvC +pnraiZUhm5qVGv39mlRhaVwHSMyrHhHSYNzcsTCF1Id06YNZrC2m/yEIvv8afYiU +i7qeFRKh3lHmymH4KVF27vTvgTADqAcwMvtjBgUSOFkYs7PoOVIwMzJ1IGmHt15m +/gxKMRHzyExsc+gFUNomk88gugf7lAkST5/UFNVNHl1w/wS5KO9hs43axpoZ1mn1 +T56ductlXKMcstQYcl83rDRL/tECVfje5XQ+T6lublZcf2+7+zbI+B0jENhpcb04 +a7o10r+Wt5MDk/pBynemLqI/dUaKDd/mMdPpPH8Gh9WMICroiWCpWP8R66gPWCXe +c1PnMG9VwSxiOnj+v0kALzjeHDa25Tx6fr5QQiQBjjIkjIPRSQ/Ppo84 +-----END CERTIFICATE----- diff --git a/compose.yaml b/compose.yaml index 7c8e64f2..42a4ae9a 100644 --- a/compose.yaml +++ b/compose.yaml @@ -19,7 +19,7 @@ x-backend-defaults: &backend_defaults services: configurator: <<: *backend_defaults - platform: linux/amd64 + platform: linux/arm64 entrypoint: - bash - -c @@ -44,11 +44,11 @@ services: backend: <<: *backend_defaults - platform: linux/amd64 + platform: linux/arm64 frontend: <<: *customizable_image - platform: linux/amd64 + platform: linux/arm64 command: - nginx-entrypoint.sh environment: @@ -68,7 +68,7 @@ services: websocket: <<: [*depends_on_configurator, *customizable_image] - platform: linux/amd64 + platform: linux/arm64 command: - node - /home/frappe/frappe-bench/apps/frappe/socketio.js @@ -77,17 +77,17 @@ services: queue-short: <<: *backend_defaults - platform: linux/amd64 + platform: linux/arm64 command: bench worker --queue short,default queue-long: <<: *backend_defaults - platform: linux/amd64 + platform: linux/arm64 command: bench worker --queue long,default,short scheduler: <<: *backend_defaults - platform: linux/amd64 + platform: linux/arm64 command: bench schedule # ERPNext requires local assets access (Frappe does not) diff --git a/development/apps-example.json b/development/apps-example.json index 513d3d10..5d49e504 100644 --- a/development/apps-example.json +++ b/development/apps-example.json @@ -1,6 +1,6 @@ [ { - "url": "https://github.com/frappe/erpnext.git", + "url": "https://github.com/dawnseeker8/erpnext.git", "branch": "version-15" } -] +] \ No newline at end of file diff --git a/images/.DS_Store b/images/.DS_Store new file mode 100644 index 00000000..e1294a5d Binary files /dev/null and b/images/.DS_Store differ diff --git a/pwd.yml b/pwd.yml index 1adf2e27..cba28a30 100644 --- a/pwd.yml +++ b/pwd.yml @@ -3,6 +3,7 @@ version: "3" services: backend: image: frappe/erpnext:v15.53.0 + platform: linux/amd64 networks: - frappe_network deploy: @@ -19,6 +20,7 @@ services: configurator: image: frappe/erpnext:v15.53.0 + platform: linux/amd64 networks: - frappe_network deploy: @@ -48,6 +50,7 @@ services: create-site: image: frappe/erpnext:v15.53.0 + platform: linux/amd64 networks: - frappe_network deploy: @@ -103,6 +106,7 @@ services: frontend: image: frappe/erpnext:v15.53.0 + platform: linux/amd64 networks: - frappe_network depends_on: @@ -129,6 +133,7 @@ services: queue-long: image: frappe/erpnext:v15.53.0 + platform: linux/amd64 networks: - frappe_network deploy: @@ -145,6 +150,7 @@ services: queue-short: image: frappe/erpnext:v15.53.0 + platform: linux/amd64 networks: - frappe_network deploy: @@ -179,6 +185,7 @@ services: scheduler: image: frappe/erpnext:v15.53.0 + platform: linux/amd64 networks: - frappe_network deploy: @@ -193,6 +200,7 @@ services: websocket: image: frappe/erpnext:v15.53.0 + platform: linux/amd64 networks: - frappe_network deploy: