mirror of
https://github.com/frappe/frappe_docker.git
synced 2024-11-09 14:50:58 +00:00
Added setup-frappe.sh as a file to the docker-frappe container, Added start-frappe.sh as a script file to start the frappe container once all the containers are up and running, Added redis and mariadb as links to the frappe container, made changes to the docker-compose and Dockerfile, issue: could'nt control startup order of containers (goal for future dev), Run docker-compose up -d to start all the containers
This commit is contained in:
parent
ef99b8baee
commit
d4d6952755
32
Dockerfile
32
Dockerfile
@ -6,6 +6,7 @@ MAINTAINER Vishal Seshagiri
|
||||
|
||||
USER root
|
||||
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
|
||||
RUN apt-get install -y redis-tools software-properties-common libxrender1 libxext6 xfonts-75dpi xfonts-base
|
||||
RUN apt-get install -y libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev python-tk apt-transport-https libsasl2-dev libldap2-dev libtiff5-dev tcl8.6-dev tk8.6-dev
|
||||
@ -18,6 +19,7 @@ RUN apt-get install -y rlwrap
|
||||
RUN apt-get install redis-server
|
||||
RUN apt-get install -y nano
|
||||
|
||||
|
||||
#nodejs
|
||||
RUN apt-get install curl
|
||||
RUN curl https://deb.nodesource.com/node_6.x/pool/main/n/nodejs/nodejs_6.7.0-1nodesource1~xenial1_amd64.deb > node.deb \
|
||||
@ -33,27 +35,13 @@ USER root
|
||||
RUN pip install -e bench-repo
|
||||
RUN apt-get install -y libmysqlclient-dev mariadb-client mariadb-common
|
||||
|
||||
#Scripts to be added to docker file
|
||||
#USER frappe
|
||||
#RUN bench init frappe-bench && cd frappe-bench
|
||||
USER frappe
|
||||
RUN bench init frappe-bench && cd frappe-bench
|
||||
|
||||
#USER root
|
||||
#RUN cd /home/frappe
|
||||
#RUN ls -l
|
||||
# frappe-bench apps sites
|
||||
#
|
||||
|
||||
# On the host machine run
|
||||
# docker ps - to get the id of mariadb container
|
||||
# docker inspect <mariadb-container-id>
|
||||
# get the IP address of the mariadb container which looks similar to this
|
||||
|
||||
# In the docker frappe container run
|
||||
# bench set-mariadb-host 172.20.0.2
|
||||
|
||||
|
||||
#RUN bench new-site site1
|
||||
#RUN bench get-app erpnext https://github.com/frappe/erpnext
|
||||
#RUN bench --site site1 install-app erpnext
|
||||
#RUN bench start
|
||||
USER root
|
||||
ADD setup-frappe.sh /home/frappe/frappe-bench
|
||||
RUN chmod +x /home/frappe/frappe-bench/setup-frappe.sh
|
||||
RUN chown -R frappe:frappe /home/frappe/frappe-bench/setup-frappe.sh
|
||||
|
||||
USER frappe
|
||||
RUN getent hosts mariadb | awk '{ print $1 }'
|
||||
|
@ -1,3 +0,0 @@
|
||||
chown -R frappe:frappe /home/frappe/code/bash_for_container.sh
|
||||
chmod +x /home/frappe/code/bash_for_container.sh
|
||||
su frappe
|
@ -19,13 +19,13 @@ services:
|
||||
- "8000:5000"
|
||||
stdin_open: true
|
||||
tty: true
|
||||
#links:
|
||||
# - redis
|
||||
# - mariadb
|
||||
network_mode: "host"
|
||||
links:
|
||||
- redis
|
||||
- mariadb
|
||||
#network_mode: "host"
|
||||
depends_on:
|
||||
- "mariadb"
|
||||
- "redis"
|
||||
- mariadb
|
||||
- redis
|
||||
volumes:
|
||||
- ./code:/home/frappe/code
|
||||
|
||||
|
20
setup-frappe.sh
Executable file → Normal file
20
setup-frappe.sh
Executable file → Normal file
@ -1,13 +1,7 @@
|
||||
docker-compose up -d
|
||||
db_id=`docker ps | grep "mariadb" | awk '{print $1}'`
|
||||
db_ip=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress }}' $db_id`
|
||||
app_id=`docker ps | grep docker_frappe | awk {'print $1'}`
|
||||
app_ip=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress }}' $app_id`
|
||||
echo 'cd ../' >> ./bash_for_container.sh
|
||||
echo 'bench init frappe-bench && cd frappe-bench' >> ./bash_for_container.sh
|
||||
echo 'bench set-mariadb-host '$db_ip >> ./bash_for_container.sh
|
||||
echo 'bench new-site site1' >> bash_for_container.sh
|
||||
echo 'bench --site site1 install-app erpnext' >> bash_for_container.sh
|
||||
echo 'bench start' >> bash_for_container.sh
|
||||
docker cp bash_for_container.sh $app_id:/home/frappe/code
|
||||
docker exec -it $app_id bash -c 'cd /home/frappe/code; exec "${SHELL:-sh}"'
|
||||
db_ip=`getent hosts mariadb | awk '{ print $1 }'`
|
||||
bench set-mariadb-host $db_ip
|
||||
bench new-site site1
|
||||
bench get-app erpnext https://github.com/frappe/erpnext
|
||||
bench --site site1 install-app erpnext
|
||||
bench start
|
||||
|
||||
|
2
start-frappe.sh
Executable file
2
start-frappe.sh
Executable file
@ -0,0 +1,2 @@
|
||||
app_id=`docker ps | grep docker_frappe | awk {'print $1'}`
|
||||
docker exec -it $app_id bash -c 'cd frappe-bench; exec "${SHELL:-sh}"'
|
Loading…
Reference in New Issue
Block a user