epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-27 09:15:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: tests use erpnext images

Browse source
This commit is contained in:
Revant Nandgaonkar 2022-12-28 05:30:38 +05:30
parent 56f6b8e939
commit 51c3e75074
4 changed files with 1 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compose.yaml
View file

@ -5,7 +5,7 @@ x-depends-on-configurator: &depends_on_configurator
x-backend-defaults: &backend_defaults x-backend-defaults: &backend_defaults
<<: *depends_on_configurator <<: *depends_on_configurator
image: frappe/frappe-worker:${FRAPPE_VERSION:?No Frappe version set} image: frappe/erpnext-worker:${ERPNEXT_VERSION:?No Frappe version set}
volumes: volumes:
- sites:/home/frappe/frappe-bench/sites - sites:/home/frappe/frappe-bench/sites
- assets:/home/frappe/frappe-bench/sites/assets:ro - assets:/home/frappe/frappe-bench/sites/assets:ro

27
overrides/compose.erpnext.yaml
View file

@ -1,27 +0,0 @@
x-erpnext-backend-image: &erpnext_backend_image
image: frappe/erpnext-worker:${ERPNEXT_VERSION:?No ERPNext version set}
volumes:
- sites:/home/frappe/frappe-bench/sites
- assets:/home/frappe/frappe-bench/sites/assets:ro
services:
configurator:
<<: *erpnext_backend_image
backend:
<<: *erpnext_backend_image
frontend:
image: frappe/erpnext-nginx:${ERPNEXT_VERSION}
queue-short:
<<: *erpnext_backend_image
queue-default:
<<: *erpnext_backend_image
queue-long:
<<: *erpnext_backend_image
scheduler:
<<: *erpnext_backend_image

24
tests/compose.ci-erpnext.yaml
View file

@ -1,24 +0,0 @@
services:
configurator:
image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
backend:
image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
frontend:
image: localhost:5000/frappe/erpnext-nginx:${ERPNEXT_VERSION}
websocket:
image: localhost:5000/frappe/frappe-socketio:${FRAPPE_VERSION}
queue-short:
image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
queue-default:
image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
queue-long:
image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
scheduler:
image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}

2
tests/utils.py
View file

@ -28,8 +28,6 @@ class Compose:
"-f", "-f",
"compose.yaml", "compose.yaml",
"-f", "-f",
"overrides/compose.erpnext.yaml",
"-f",
"overrides/compose.proxy.yaml", "overrides/compose.proxy.yaml",
"-f", "-f",
"overrides/compose.mariadb.yaml", "overrides/compose.mariadb.yaml",