2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2025-02-03 12:38:29 +00:00

Merge pull request #32 from joezsweet/clone-bench-master

Make work on latest
This commit is contained in:
Ameya Shenoy 2018-02-28 15:22:10 +05:30 committed by GitHub
commit ac3551d6ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions

View File

@ -19,6 +19,8 @@ RUN apt-get install -y rlwrap
RUN apt-get install redis-tools
RUN apt-get install -y nano
# Generate locale C.UTF-8 for mariadb and general locale data
ENV LANG C.UTF-8
#nodejs
RUN apt-get install curl
@ -29,11 +31,12 @@ RUN apt-get install -y wkhtmltopdf
USER frappe
WORKDIR /home/frappe
RUN git clone -b develop https://github.com/frappe/bench.git bench-repo
RUN git clone -b master https://github.com/frappe/bench.git bench-repo
USER root
RUN pip install -e bench-repo
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

2
dbench
View File

@ -17,7 +17,7 @@ if [[ $# -eq 0 ]]; then
elif [ $1 == 'init' ]
then
docker exec -i -u root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*"
docker exec -it frappe bash -c "cd .. && bench init frappe-bench --skip-bench-mkdir --skip-redis-config-generation && cd frappe-bench"
docker exec -it frappe bash -c "cd .. && bench init frappe-bench --ignore-exist --skip-redis-config-generation && cd frappe-bench"
docker exec -it frappe bash -c "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json"
docker exec -it -u root frappe bash -c "apt-get install vim && apt-get install sudo && usermod -aG sudo frappe && printf '# User rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe"
docker exec -it frappe bash -c "bench set-mariadb-host mariadb"