epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-17 13:55:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

moving some things around for less lines

Browse source
This commit is contained in:
Mendel Greenberg 2019-01-20 07:02:09 -05:00
parent 8a4e2d02d4
commit 1ae03914ab
No known key found for this signature in database
GPG key ID: B26A7D2DF7DC6EF7
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile
View file

@ -23,12 +23,12 @@ RUN curl https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.10.0-
USER frappe
WORKDIR /home/frappe
RUN git clone -b master https://github.com/frappe/bench.git bench-repo
RUN chown -R frappe:frappe /home/frappe \
&& git clone -b master https://github.com/frappe/bench.git bench-repo
USER root
RUN pip install -e bench-repo && rm -rf ~/.cache/pip \
&& npm install -g yarn \
&& chown -R frappe:frappe /home/frappe/*
&& npm install -g yarn
USER frappe
WORKDIR /home/frappe/frappe-bench

4
dbench
View file

@ -3,7 +3,7 @@
if [[ $# -eq 0 ]]; then
docker exec -it frappe bash
elif [ "$1" == 'init' ]; then
docker exec -itu root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*"
# docker exec -itu root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*"
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 Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json && bench set-mariadb-host mariadb"
elif [ "$1" == 'setup' ] && [ "$2" == 'docker' ]; then
@ -34,8 +34,6 @@ elif [ "$1" == '-h' ]; then
echo "Usage:"
echo " $0"
echo " Launches you into an interactive shell in the container as user frappe"
echo " $0 init [ bench-folder-name ]"
echo " Runs \"bench init\" along with some other commands"
echo " $0 setup docker [ stop | down ]"
echo " Starts and builds the docker containers using \"docker-compose up -d\""
echo " $0 setup hosts"