From 64123980e5ce4554817d98c6502f599025b896f7 Mon Sep 17 00:00:00 2001 From: vishalseshagiri Date: Tue, 1 Aug 2017 17:05:42 +0530 Subject: [PATCH] Changed the Procfile and site/common-site-config filenames --- Dockerfile | 5 ++--- docker-compose.yml | 1 - frappe-bench/{Procfile => Procfile_docker} | 0 ...ommon_site_config.json => common_site_config_docker.json} | 0 4 files changed, 2 insertions(+), 4 deletions(-) rename frappe-bench/{Procfile => Procfile_docker} (100%) rename frappe-bench/sites/{common_site_config.json => common_site_config_docker.json} (100%) diff --git a/Dockerfile b/Dockerfile index 4b87edad..62fc03e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,13 +29,12 @@ RUN apt-get install -y wkhtmltopdf USER frappe WORKDIR /home/frappe -RUN git clone https://github.com/frappe/bench bench-repo +RUN git clone -b develop https://github.com/vishalseshagiri/bench.git bench-repo USER root RUN pip install -e bench-repo RUN apt-get install -y libmysqlclient-dev mariadb-client mariadb-common +RUN chown -R frappe:frappe /home/frappe/* USER frappe WORKDIR /home/frappe/frappe-bench -#RUN mv /home/pyth/frappe/frappe_docker/frappe-bench/sites/common_site_config_docker.json /home/pyth/frappe/frappe_docker/frappe-bench/sites/common_site_config.json -#RUN mv /home/pyth/frappe/frappe_docker/frappe-bench/Procfile_docker /home/pyth/frappe/frappe_docker/frappe-bench/Procfile diff --git a/docker-compose.yml b/docker-compose.yml index 406840a2..21aa75ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,6 @@ services: frappe: volumes: - ./frappe-bench:/home/frappe/frappe-bench - - /home/pyth/frappe/bench_frappe/bench:/home/frappe/bench-repo build: . ports: - "8000:8000" diff --git a/frappe-bench/Procfile b/frappe-bench/Procfile_docker similarity index 100% rename from frappe-bench/Procfile rename to frappe-bench/Procfile_docker diff --git a/frappe-bench/sites/common_site_config.json b/frappe-bench/sites/common_site_config_docker.json similarity index 100% rename from frappe-bench/sites/common_site_config.json rename to frappe-bench/sites/common_site_config_docker.json