From daef926b069bebf8667119f9cb8ccc8fd3a50d87 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Thu, 11 Jun 2020 12:55:27 +0530 Subject: [PATCH 1/2] feat(frappe/bench): allow 5 benches --- .devcontainer/docker-compose.yml | 2 +- build/bench/Dockerfile | 2 +- development/README.md | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 3b0907c5..b0a1e6d6 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -19,7 +19,7 @@ services: image: redis:alpine frappe: - build: . + image: frappe/bench:latest command: sleep infinity volumes: - ..:/workspace:cached diff --git a/build/bench/Dockerfile b/build/bench/Dockerfile index 5b2a67eb..03ad4bad 100644 --- a/build/bench/Dockerfile +++ b/build/bench/Dockerfile @@ -113,4 +113,4 @@ RUN bash -c "node --version" \ && bash -c "npm --version" \ && bash -c "yarn --version" -EXPOSE 8000 9000 6787 +EXPOSE 8000-8005 9000-9005 6787 diff --git a/development/README.md b/development/README.md index 24bac719..030bfe35 100644 --- a/development/README.md +++ b/development/README.md @@ -244,13 +244,6 @@ EXIT; 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 From 306d7e73dae6ab4f4fbad65a3ae22aa74cd90741 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Thu, 11 Jun 2020 13:43:27 +0530 Subject: [PATCH 2/2] feat(frappe/bench): delete devcontainer Dockerfile Delete additional Dockerfile from .devcontainer [skip travis] --- .devcontainer/Dockerfile | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .devcontainer/Dockerfile diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index 85ef0a5a..00000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM frappe/bench:latest -EXPOSE 8000-8005 9000-9005 6787