epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-22 15:55:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1 from chabad360/revert

Browse source 
revert
This commit is contained in:
chabad360 2018-08-01 12:53:46 -07:00 committed by GitHub
commit 0212cb0486
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.travis.yml
View file

@ -12,10 +12,9 @@ services:
install: install:
- docker-compose build - docker-compose build
- docker-compose up -d - docker-compose up -d
- docker exec -i frappe bash -c "ls" - docker exec -it -u root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*"
- docker exec -i frappe bash -c "bench init frappe-bench" - docker exec -i frappe bash -c "cd .. && bench init frappe-bench --ignore-exist --skip-redis-config-generation && cd 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 "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json 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" - 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" - 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' - sudo su -c 'echo 127.0.0.1 site1.local >> /etc/hosts'

5
Dockerfile
View file

@ -1,4 +1,4 @@

#bench Dockerfile #bench Dockerfile
FROM ubuntu:16.04 FROM ubuntu:16.04
@ -30,6 +30,9 @@ RUN curl https://deb.nodesource.com/node_6.x/pool/main/n/nodejs/nodejs_6.7.0-1no
RUN apt-get install -y wkhtmltopdf RUN apt-get install -y wkhtmltopdf
RUN apt-get install -y libmysqlclient-dev mariadb-client mariadb-common RUN apt-get install -y libmysqlclient-dev mariadb-client mariadb-common
RUN npm install -g yarn RUN npm install -g yarn
RUN chown -R frappe:frappe /home/frappe/*
ENV PATH /home/frappe/.local/bin
USER frappe USER frappe
WORKDIR /home/frappe/ WORKDIR /home/frappe/