From 450e1b64aa9c982e3d3e26b4a8ce456b0de17ea1 Mon Sep 17 00:00:00 2001 From: africlouds Date: Wed, 10 Jun 2020 09:19:23 +0200 Subject: [PATCH 1/4] Added Dockerfile for dev env Exposing port range 8000-8005 and 9000-9005. The Dockerfile allows easy extending the upstream bench image for development purpose --- .devcontainer/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .devcontainer/Dockerfile diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000..85ef0a5a --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,2 @@ +FROM frappe/bench:latest +EXPOSE 8000-8005 9000-9005 6787 From aa8e7d374c1feb60cdf3d8addacbda97356c1470 Mon Sep 17 00:00:00 2001 From: africlouds Date: Wed, 10 Jun 2020 09:22:47 +0200 Subject: [PATCH 2/4] Build frappe with Dockerfile - Build frappe image using development Dockerfile instead of bench:latest image - Exposing port range --- .devcontainer/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index e4346512..3b0907c5 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -19,14 +19,14 @@ services: image: redis:alpine frappe: - image: frappe/bench:latest + build: . command: sleep infinity volumes: - ..:/workspace:cached working_dir: /workspace/development ports: - - "8000:8000" - - "9000:9000" + - "8000-8005:8000-8005" + - "9000-9005:9000-9005" volumes: mariadb-vol: From 84bf55860a81edd8832b4215f4cae89c30afe76d Mon Sep 17 00:00:00 2001 From: africlouds Date: Wed, 10 Jun 2020 09:28:38 +0200 Subject: [PATCH 3/4] Updated Docs for multi bench --- development/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/development/README.md b/development/README.md index ccad94a5..778ee82b 100644 --- a/development/README.md +++ b/development/README.md @@ -243,7 +243,10 @@ EXIT; ## Manually start containers In case you don't use VSCode, you may start the containers manually with the following command: - +```shell +cd .devcontainer +docker-compose build +``` ```shell docker-compose -f .devcontainer/docker-compose.yml up -d ``` From 8ca5879211e5247df2a161c6d502d86ecbdb98ba Mon Sep 17 00:00:00 2001 From: africlouds Date: Wed, 10 Jun 2020 09:30:57 +0200 Subject: [PATCH 4/4] Updated build images commands Before starting the images, build the frappe images --- development/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/development/README.md b/development/README.md index 778ee82b..24bac719 100644 --- a/development/README.md +++ b/development/README.md @@ -243,10 +243,15 @@ EXIT; ## Manually start containers In case you don't use VSCode, you may start the containers manually with the following command: + +### Building the containers ```shell cd .devcontainer docker-compose build +cd .. ``` + +### Running the containers ```shell docker-compose -f .devcontainer/docker-compose.yml up -d ```