mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-22 15:55:09 +00:00
update justfile, add named network to docker-compose
This commit is contained in:
parent
5aba358714
commit
d1e4944ff7
2 changed files with 20 additions and 1 deletions
|
|
@ -11,6 +11,9 @@ services:
|
||||||
MYSQL_ROOT_PASSWORD: 123
|
MYSQL_ROOT_PASSWORD: 123
|
||||||
volumes:
|
volumes:
|
||||||
- mariadb-data:/var/lib/mysql
|
- mariadb-data:/var/lib/mysql
|
||||||
|
networks:
|
||||||
|
frappe-network:
|
||||||
|
ipv4_address: 172.20.0.10
|
||||||
|
|
||||||
# Enable PostgreSQL only if you use it, see development/README.md for more information.
|
# Enable PostgreSQL only if you use it, see development/README.md for more information.
|
||||||
# postgresql:
|
# postgresql:
|
||||||
|
|
@ -40,12 +43,18 @@ services:
|
||||||
platform: linux/amd64
|
platform: linux/amd64
|
||||||
volumes:
|
volumes:
|
||||||
- redis-cache-data:/data
|
- redis-cache-data:/data
|
||||||
|
networks:
|
||||||
|
frappe-network:
|
||||||
|
ipv4_address: 172.20.0.11
|
||||||
|
|
||||||
redis-queue:
|
redis-queue:
|
||||||
image: docker.io/redis:alpine
|
image: docker.io/redis:alpine
|
||||||
platform: linux/amd64
|
platform: linux/amd64
|
||||||
volumes:
|
volumes:
|
||||||
- redis-queue-data:/data
|
- redis-queue-data:/data
|
||||||
|
networks:
|
||||||
|
frappe-network:
|
||||||
|
ipv4_address: 172.20.0.12
|
||||||
|
|
||||||
frappe:
|
frappe:
|
||||||
image: docker.io/frappe/bench:latest
|
image: docker.io/frappe/bench:latest
|
||||||
|
|
@ -61,6 +70,9 @@ services:
|
||||||
ports:
|
ports:
|
||||||
- 8000-8005:8000-8005
|
- 8000-8005:8000-8005
|
||||||
- 9000-9005:9000-9005
|
- 9000-9005:9000-9005
|
||||||
|
networks:
|
||||||
|
frappe-network:
|
||||||
|
ipv4_address: 172.20.0.13
|
||||||
# enable the below service if you need Cypress UI Tests to be executed
|
# enable the below service if you need Cypress UI Tests to be executed
|
||||||
# Before enabling ensure install_x11_deps.sh has been executed and display variable is exported.
|
# Before enabling ensure install_x11_deps.sh has been executed and display variable is exported.
|
||||||
# Run install_x11_deps.sh again if DISPLAY is not set
|
# Run install_x11_deps.sh again if DISPLAY is not set
|
||||||
|
|
@ -94,3 +106,10 @@ volumes:
|
||||||
redis-queue-data:
|
redis-queue-data:
|
||||||
#postgresql-data:
|
#postgresql-data:
|
||||||
#mailpit-data:
|
#mailpit-data:
|
||||||
|
|
||||||
|
networks:
|
||||||
|
frappe-network:
|
||||||
|
driver: bridge
|
||||||
|
ipam:
|
||||||
|
config:
|
||||||
|
- subnet: 172.20.0.0/16
|
||||||
|
|
|
||||||
2
Justfile
2
Justfile
|
|
@ -17,7 +17,7 @@ down:
|
||||||
|
|
||||||
# Enter the frappe container in interactive mode
|
# Enter the frappe container in interactive mode
|
||||||
shell:
|
shell:
|
||||||
docker compose -f .devcontainer/docker-compose.yml exec --user frappe --workdir /workspace/development frappe bash
|
docker compose -f .devcontainer/docker-compose.yml exec --user frappe --workdir /workspace/development/frappe-bench frappe bash
|
||||||
|
|
||||||
# View logs from all devcontainer services
|
# View logs from all devcontainer services
|
||||||
logs:
|
logs:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue