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

ci: skip frappe builds

Browse source
This commit is contained in:
Revant Nandgaonkar 2022-12-28 12:29:56 +05:30
parent f8e43a3114
commit 5a38d8da29
6 changed files with 12 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
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 ERPNext 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,7 +27,7 @@ services:
<<: *backend_defaults <<: *backend_defaults
frontend: frontend:
image: frappe/frappe-nginx:${FRAPPE_VERSION} image: frappe/erpnext-nginx:${ERPNEXT_VERSION}
environment: environment:
BACKEND: backend:8000 BACKEND: backend:8000
SOCKETIO: websocket:9000 SOCKETIO: websocket:9000

8
docker-bake.hcl
View file

@ -44,16 +44,12 @@ target "bench-test" {
# Main images # Main images
# Base for all other targets # Base for all other targets
group "frappe" {
targets = ["frappe-worker", "frappe-nginx", "frappe-socketio"]
}
group "erpnext" { group "erpnext" {
targets = ["erpnext-worker", "erpnext-nginx"] targets = ["erpnext-worker", "erpnext-nginx", "frappe-socketio"]
} }
group "default" { group "default" {
targets = ["frappe", "erpnext"] targets = ["erpnext"]
} }
function "tag" { function "tag" {

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}

14
tests/compose.ci.yaml
View file

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

6
tests/conftest.py
View file

@ -68,11 +68,7 @@ def frappe_site(compose: Compose):
@pytest.fixture(scope="class") @pytest.fixture(scope="class")
def erpnext_setup(compose: Compose): def erpnext_setup(compose: Compose):
compose.stop() compose.stop()
compose("up", "-d", "--quiet-pull")
args = ["-f", "overrides/compose.erpnext.yaml"]
if CI:
args += ("-f", "tests/compose.ci-erpnext.yaml")
compose(*args, "up", "-d", "--quiet-pull")
yield yield
compose.stop() compose.stop()