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

fixed travis, and cleaned up dbench a little

Browse source
This commit is contained in:
chabad360 2018-10-05 19:57:59 +00:00
parent cde3a5ce0d
commit 581966352d
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -8,11 +8,11 @@ services:
- docker - docker
install: install:
- chmod ugo+x ./bench - chmod ugo+x ./dbench
- ./bench setup docker - ./dbench setup docker
- ./bench init frappe-bench - ./dbench init frappe-bench
- ./bench new-site site1.local - ./dbench new-site site1.local
- ./bench setup hosts' - ./dbench setup hosts'
- pip install --upgrade virtualenv - pip install --upgrade virtualenv
- virtualenv -p python3 testenv - virtualenv -p python3 testenv
- source testenv/bin/activate - source testenv/bin/activate

6
Dockerfile
View file

@ -5,7 +5,6 @@ FROM ubuntu:16.04
LABEL MAINTAINER frappé LABEL MAINTAINER frappé
USER root USER root
RUN useradd -ms /bin/bash frappe
RUN apt-get update RUN apt-get update
RUN apt-get install -y iputils-ping git build-essential python-setuptools python-dev libffi-dev libssl-dev libjpeg8-dev \ RUN apt-get install -y iputils-ping git build-essential python-setuptools python-dev libffi-dev libssl-dev libjpeg8-dev \
redis-tools redis-server software-properties-common libxrender1 libxext6 xfonts-75dpi xfonts-base zlib1g-dev libfreetype6-dev \ redis-tools redis-server software-properties-common libxrender1 libxext6 xfonts-75dpi xfonts-base zlib1g-dev libfreetype6-dev \
@ -30,7 +29,8 @@ RUN git clone -b master https://github.com/frappe/bench.git bench-repo
USER root USER root
RUN pip install -e bench-repo \ RUN pip install -e bench-repo \
&& npm install -g yarn \ && npm install -g yarn \
&& chown -R frappe:frappe /home/frappe/* && chown -R frappe:frappe /home/frappe/* \
&& && rm -rf /var/lib/apt/lists/*
USER frappe USER frappe
WORKDIR /home/frappe/frappe-bench WORKDIR /home/frappe/frappe-bench

9
dbench
View file

@ -1,10 +1,9 @@
#!/bin/bash #!/bin/bash
if [[ $# -eq 0 ]]; then if [[ $# -eq 0 ]]; then
docker exec -it frappe bash docker exec -it frappe bash
elif [ "$1" == 'init' ]; then elif [ "$1" == 'init' ]; then
docker exec -it -u 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" docker exec -i frappe bash -c "cd .. && bench init frappe-bench --ignore-exist --skip-redis-config-generation"
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" 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' ]; then elif [ "$1" == 'setup' ]; then
@ -20,15 +19,15 @@ elif [ "$1" == 'setup' ]; then
a=$(echo $a | tr -d / ) a=$(echo $a | tr -d / )
result="127.0.0.1 ${a}" result="127.0.0.1 ${a}"
sudo echo $result >> /etc/hosts sudo echo $result >> /etc/hosts
docker exec -u root -i frappe bash -c "echo ${result} | tee --append /etc/hosts" docker exec -iu root frappe bash -c "echo ${result} | tee --append /etc/hosts"
docker exec -itu root frappe bash -c "printf '# User rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe" docker exec -itu root frappe bash -c "printf '# User rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe"
fi fi
elif [ "$1" == '-c' ]; then elif [ "$1" == '-c' ]; then
shift shift
user=$1 user=$1
shift shift
docker exec -i -u "$user" frappe bash -c "$@" docker exec -iu "$user" frappe bash -c "$@"
else else
IFS=" " IFS=" "
docker exec -i frappe bash -c "bench $*" docker exec -it frappe bash -c "bench $*"
fi fi