From 97d946a284c7f8fae37b6323b36b18b0d56a51c3 Mon Sep 17 00:00:00 2001 From: vishalseshagiri Date: Mon, 24 Jul 2017 17:02:56 +0530 Subject: [PATCH 1/5] Update README.md Former-commit-id: 65db1ef77b8b36b96ff1cb6a876c0083dd441c95 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aed24368..79e93f48 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ A step by step series of examples that tell you have to get a development env ru 2. Accessing the frappe container via CLI - ./start-container.sh + ./enter-container.sh 3. Create a new bench From 1b0f9c21739c47cf6d85d2e5b7a2603ab3ff480b Mon Sep 17 00:00:00 2001 From: vishalseshagiri Date: Mon, 24 Jul 2017 17:41:20 +0530 Subject: [PATCH 2/5] Update README.md Former-commit-id: 09577041fc62c5f7aff9122ab77cb67e8cc32f7d --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 79e93f48..03eada6a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # frappe_docker -Containerizing the frappe bench installation for a development environment +* Docker file to run frappe in a container +* Docker makes it much easier to deploy [frappe](https://github.com/frappe/frappe) on your development servers. ## Getting Started @@ -10,10 +11,9 @@ These instructions will get you a copy of the project up and running on your loc What things you need to install the software and how to install them -``` -Docker -docker-compose -``` + + [Docker](https://www.docker.com/) + [Docker Compose](https://docs.docker.com/compose/overview/) ### Installing From fddd98e12732631d02ae153754b819167b71244b Mon Sep 17 00:00:00 2001 From: vishalseshagiri Date: Mon, 24 Jul 2017 17:51:38 +0530 Subject: [PATCH 3/5] Update README.md Former-commit-id: 4bb67b72e47f74f95ecd0046db16ca8215c9b88c --- README.md | 59 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 03eada6a..c7efcba6 100644 --- a/README.md +++ b/README.md @@ -11,28 +11,67 @@ These instructions will get you a copy of the project up and running on your loc What things you need to install the software and how to install them +[Docker](https://www.docker.com/) +[Docker Compose](https://docs.docker.com/compose/overview/) - [Docker](https://www.docker.com/) - [Docker Compose](https://docs.docker.com/compose/overview/) +### Container Configuration + +#### ports: + +``` +ports: + - "3306:3306" + - "8000:8000" +``` + +Expose port 3306 inside the container on port 3306 on ALL local host interfaces. In order to bind to only one interface, you may specify the host's IP address as `([:[host_port]])|():[/udp]` as defined in the [docker port binding documentation](http://docs.docker.com/userguide/dockerlinks/) + +#### volumes: + +``` +volumes: + - ./frappe:/home/frappe + - ./conf/mariadb-conf.d:/etc/mysql/conf.d +``` +Expose a directory inside the host to the container. + +#### links: + +``` +links: + - redis + - mariadb +``` + +Links another container to the current container. This will add `--link postgres:postgres` +to the options when running the container. + +#### depends_on: + +``` +depends_on: + - mariadb + - redis +``` + Express dependency between services, which has two effects: + + 1. docker-compose up will start services in dependency order. In the following example, db and redis will be started before web. + + 2. docker-compose up SERVICE will automatically include SERVICE’s dependencies. In the following example, docker-compose up web will also create and start db and redis. ### Installing A step by step series of examples that tell you have to get a development env running #### 1. Installation Pre-requisites -- Installing Docker Community Edition +- Installing Docker Community Edition (version 17.06.0-ce) Follow the steps given in [here](https://docs.docker.com/engine/installation) - Docker version 17.06.0-ce, build 02c1d87 - -- Installing docker-compose(only for Linux users).Docker for Mac, Docker for Windows, and Docker Toolbox include Docker Compose - +- Installing docker-compose(only for Linux users).Docker for Mac, Docker for Windows, and Docker Toolbox include Docker Compose (version 1.14.0) Follow the steps given in [here](https://docs.docker.com/compose/install/) - docker-compose version 1.14.0, build c7bdf9e - #### 2. Build the container and install bench * Make sure your logged in as root. Build the container and install bench inside the container as a **non root** user @@ -115,7 +154,7 @@ A step by step series of examples that tell you have to get a development env ru To login to Frappe / ERPNext, open your browser and go to `[your-external-ip]:8000`, probably `localhost:8000` - The default username is "Administrator" and password is what you set when you created the new site. +The default username is "Administrator" and password is what you set when you created the new site. ## Built With From 495d744f054457940cf09255dbd770c448a8b874 Mon Sep 17 00:00:00 2001 From: vishalseshagiri Date: Mon, 24 Jul 2017 17:52:30 +0530 Subject: [PATCH 4/5] Update README.md Former-commit-id: c20aa551aba5a895db7f1a4aac8355ec7cc1eaa1 --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c7efcba6..ef7186da 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ These instructions will get you a copy of the project up and running on your loc What things you need to install the software and how to install them [Docker](https://www.docker.com/) + [Docker Compose](https://docs.docker.com/compose/overview/) ### Container Configuration @@ -53,11 +54,11 @@ depends_on: - mariadb - redis ``` - Express dependency between services, which has two effects: +Express dependency between services, which has two effects: - 1. docker-compose up will start services in dependency order. In the following example, db and redis will be started before web. +1. docker-compose up will start services in dependency order. In the following example, db and redis will be started before web. - 2. docker-compose up SERVICE will automatically include SERVICE’s dependencies. In the following example, docker-compose up web will also create and start db and redis. +2. docker-compose up SERVICE will automatically include SERVICE’s dependencies. In the following example, docker-compose up web will also create and start db and redis. ### Installing From 56a203d37ceb03801c8e9e610ba8bc1a888a8a7b Mon Sep 17 00:00:00 2001 From: vishalseshagiri Date: Mon, 24 Jul 2017 17:55:58 +0530 Subject: [PATCH 5/5] Update README.md Former-commit-id: 70f54a9b666294ee50f7c17f5a90b9523f0d2304 --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ef7186da..c1013c99 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # frappe_docker -* Docker file to run frappe in a container +* Docker Compose file to run frappe in a container * Docker makes it much easier to deploy [frappe](https://github.com/frappe/frappe) on your development servers. ## Getting Started @@ -44,8 +44,7 @@ links: - mariadb ``` -Links another container to the current container. This will add `--link postgres:postgres` -to the options when running the container. +Links another container to the current container. This will add `--link docker_frappe:mariadb` and `--link docker_frappe:redis` to the options when running the container. #### depends_on: