From 3a497e1e0d79866a873097b95cd23e7adf431fc4 Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 09:50:25 -0700 Subject: [PATCH 01/13] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6c78c5e5..8232ea24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ install: - docker-compose build - docker-compose up -d - docker exec -it -u root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*" - - docker exec -i frappe bash -c "cd .. && bench init frappe-bench --skip-bench-mkdir --skip-redis-config-generation && cd frappe-bench" + - docker exec -i frappe bash -c "cd .. && bench init frappe-bench --skip-redis-config-generation && cd frappe-bench" - docker exec -i frappe bash -c "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json" - docker exec -i frappe bash -c "bench new-site site1.local" - docker exec -i -u root frappe bash -c "echo 127.0.0.1 site1.local >> /etc/hosts" From 060c86f52b506b80d3646a21f82903f589bb0795 Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 09:55:50 -0700 Subject: [PATCH 02/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6308622c..914b63ad 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # frappe_docker -[![Build Status](https://travis-ci.org/frappe/frappe_docker.svg?branch=master)](https://travis-ci.org/frappe/frappe_docker) +[![Build Status](https://travis-ci.org/chabad360/frappe_docker.svg?branch=master)](https://travis-ci.org/frappe/frappe_docker) - [Docker](https://docker.com/) is an open source project to pack, ship and run any Linux application in a lighter weight, faster container than a traditional virtual machine. From 95426877e0a24c9619a00dcf659940e9c7163ccf Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 09:57:08 -0700 Subject: [PATCH 03/13] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8232ea24..8636bc6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ install: - docker-compose build - docker-compose up -d - docker exec -it -u root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*" - - docker exec -i frappe bash -c "cd .. && bench init frappe-bench --skip-redis-config-generation && cd frappe-bench" + - docker exec -i frappe bash -c "cd .. && cd frappe-bench" - docker exec -i frappe bash -c "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json" - docker exec -i frappe bash -c "bench new-site site1.local" - docker exec -i -u root frappe bash -c "echo 127.0.0.1 site1.local >> /etc/hosts" From 4c4ad963c9ee4d581961d8b9425c6b34370d7542 Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 10:20:02 -0700 Subject: [PATCH 04/13] Update Dockerfile --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7f5b9a14..cc6a5c51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,11 +33,13 @@ USER frappe WORKDIR /home/frappe RUN git clone -b master https://github.com/frappe/bench.git bench-repo -USER root + RUN pip install -e bench-repo + +USER root RUN apt-get install -y libmysqlclient-dev mariadb-client mariadb-common RUN npm install -g yarn -RUN chown -R frappe:frappe /home/frappe/* USER frappe + WORKDIR /home/frappe/frappe-bench From 32451fc1f44e5321122921e042ce92fcf4028076 Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 10:40:55 -0700 Subject: [PATCH 05/13] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cc6a5c51..085420d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ WORKDIR /home/frappe RUN git clone -b master https://github.com/frappe/bench.git bench-repo -RUN pip install -e bench-repo +RUN pip install --user -e bench-repo USER root RUN apt-get install -y libmysqlclient-dev mariadb-client mariadb-common From 9b09d614330d30c1478cd5f1148fc1be08e9e3ef Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 10:45:11 -0700 Subject: [PATCH 06/13] Update .travis.yml --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8636bc6e..3a2e2f9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,9 @@ services: install: - docker-compose build - docker-compose up -d - - docker exec -it -u root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*" - - docker exec -i frappe bash -c "cd .. && cd frappe-bench" + + + - docker exec -i frappe bash -c "bench init frappe-bench && cd frappe-bench" - docker exec -i frappe bash -c "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json" - docker exec -i frappe bash -c "bench new-site site1.local" - docker exec -i -u root frappe bash -c "echo 127.0.0.1 site1.local >> /etc/hosts" From c8fcbe0fdb4a5507450445c85445332e41d7a18b Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 11:23:14 -0700 Subject: [PATCH 07/13] Update Dockerfile --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 085420d3..ea1c6476 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,8 +32,6 @@ RUN apt-get install -y wkhtmltopdf USER frappe WORKDIR /home/frappe RUN git clone -b master https://github.com/frappe/bench.git bench-repo - - RUN pip install --user -e bench-repo USER root @@ -41,5 +39,5 @@ RUN apt-get install -y libmysqlclient-dev mariadb-client mariadb-common RUN npm install -g yarn USER frappe - -WORKDIR /home/frappe/frappe-bench +ENV PATH /home/frappe/.local/bin:$PATH +WORKDIR /home/frappe/ From 922832c92c9d6b2255eb429817e1c3f4b7a8652f Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 11:33:12 -0700 Subject: [PATCH 08/13] Update .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a2e2f9c..dae20c80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: python + python: - "2.7" + env: - DOCKER_COMPOSE_VERSION: 1.8.0 @@ -12,7 +14,7 @@ install: - docker-compose up -d - - docker exec -i frappe bash -c "bench init frappe-bench && cd frappe-bench" + - docker exec -i frappe bash -c "cd frappe-bench" - docker exec -i frappe bash -c "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json" - docker exec -i frappe bash -c "bench new-site site1.local" - docker exec -i -u root frappe bash -c "echo 127.0.0.1 site1.local >> /etc/hosts" From 1113efd652f2c590035129c2f4702135b69e93be Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 11:39:05 -0700 Subject: [PATCH 09/13] Update Dockerfile --- Dockerfile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index ea1c6476..9627063d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ FROM ubuntu:16.04 MAINTAINER frappé USER root +RUN useradd -ms /bin/bash frappe RUN apt-get update RUN apt-get install -y iputils-ping RUN apt-get install -y git build-essential python-setuptools python-dev libffi-dev libssl-dev @@ -13,7 +14,6 @@ RUN apt-get install -y libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev lib RUN apt-get install -y wget RUN wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py RUN pip install --upgrade setuptools pip -RUN useradd -ms /bin/bash frappe RUN apt-get install -y curl RUN apt-get install -y rlwrap RUN apt-get install redis-tools @@ -28,16 +28,12 @@ RUN curl https://deb.nodesource.com/node_6.x/pool/main/n/nodejs/nodejs_6.7.0-1no && dpkg -i node.deb \ && rm node.deb RUN apt-get install -y wkhtmltopdf - -USER frappe -WORKDIR /home/frappe -RUN git clone -b master https://github.com/frappe/bench.git bench-repo -RUN pip install --user -e bench-repo - -USER root RUN apt-get install -y libmysqlclient-dev mariadb-client mariadb-common RUN npm install -g yarn USER frappe +WORKDIR /home/frappe/ +RUN git clone https://github.com/frappe/bench.git bench-repo +RUN pip install --user -e bench-repo ENV PATH /home/frappe/.local/bin:$PATH WORKDIR /home/frappe/ From 4841bd1fdd078abf2767aa22f18030bc14853e40 Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 12:25:21 -0700 Subject: [PATCH 10/13] fixed frappe isues --- {frappe-bench => frappe-site}/Procfile_docker | 0 .../sites/common_site_config_docker.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {frappe-bench => frappe-site}/Procfile_docker (100%) rename {frappe-bench => frappe-site}/sites/common_site_config_docker.json (100%) diff --git a/frappe-bench/Procfile_docker b/frappe-site/Procfile_docker similarity index 100% rename from frappe-bench/Procfile_docker rename to frappe-site/Procfile_docker diff --git a/frappe-bench/sites/common_site_config_docker.json b/frappe-site/sites/common_site_config_docker.json similarity index 100% rename from frappe-bench/sites/common_site_config_docker.json rename to frappe-site/sites/common_site_config_docker.json From e41b4abce3d080655f8fe79cdd51b3d3a874917b Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 12:28:33 -0700 Subject: [PATCH 11/13] fixed proc_file issues --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dae20c80..838db9ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,9 @@ install: - docker-compose up -d + - docker exec -i frappe bash -c "bench new-site frappe-bench" + - docker exec -i frappe bash -c "mv frappe-site/Procfile_docker frappe-bench/Procfile && mv frappe-site/sites/common_site_config_docker.json frappe-bench/sites/common_site_config.json" - docker exec -i frappe bash -c "cd frappe-bench" - - docker exec -i frappe bash -c "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json" - docker exec -i frappe bash -c "bench new-site site1.local" - docker exec -i -u root frappe bash -c "echo 127.0.0.1 site1.local >> /etc/hosts" - sudo su -c 'echo 127.0.0.1 site1.local >> /etc/hosts' From f2034f874e78483994834d2eef51b85b20f3a02e Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 12:34:02 -0700 Subject: [PATCH 12/13] oops --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 838db9ab..f75c5433 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ install: - docker-compose up -d - - docker exec -i frappe bash -c "bench new-site frappe-bench" + - docker exec -i frappe bash -c "bench init frappe-bench" - docker exec -i frappe bash -c "mv frappe-site/Procfile_docker frappe-bench/Procfile && mv frappe-site/sites/common_site_config_docker.json frappe-bench/sites/common_site_config.json" - docker exec -i frappe bash -c "cd frappe-bench" - docker exec -i frappe bash -c "bench new-site site1.local" From bf849a0d486b06c5672bc3c8be8dc0ee6849f025 Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 12:40:44 -0700 Subject: [PATCH 13/13] added a debug --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f75c5433..2558893a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,7 @@ services: install: - docker-compose build - docker-compose up -d - - + - docker exec -i frappe bash -c "ls" - docker exec -i frappe bash -c "bench init frappe-bench" - docker exec -i frappe bash -c "mv frappe-site/Procfile_docker frappe-bench/Procfile && mv frappe-site/sites/common_site_config_docker.json frappe-bench/sites/common_site_config.json" - docker exec -i frappe bash -c "cd frappe-bench"