added a .dockerignore and fixed the dockerfile up a bit

This commit is contained in:
Mendel Greenberg 2019-01-24 06:33:24 -05:00
parent a7f564e222
commit cf3c4dc173
No known key found for this signature in database
GPG key ID: B26A7D2DF7DC6EF7
2 changed files with 15 additions and 10 deletions

7
.dockerignore Normal file
View file

@ -0,0 +1,7 @@
# frappe_docker .dockerignore file
conf/*
.travis.yml
test.py
dbench
docker-*.yml

View file

@ -1,18 +1,16 @@
#bench Dockerfile
# Frappe Bench Dockerfile
FROM ubuntu:16.04
LABEL MAINTAINER frappé
LABEL author=frappé
USER root
# Generate locale C.UTF-8 for mariadb and general locale data
ENV LANG C.UTF-8
RUN apt-get update && 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 \
liblcms2-dev libwebp-dev python-tk apt-transport-https libsasl2-dev libldap2-dev libtiff5-dev tcl8.6-dev tk8.6-dev \
wget libmysqlclient-dev mariadb-client mariadb-common curl rlwrap redis-tools nano wkhtmltopdf python-pip vim sudo && apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN apt-get update && 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 liblcms2-dev libwebp-dev python-tk apt-transport-https libsasl2-dev libldap2-dev libtiff5-dev tcl8.6-dev \
tk8.6-dev wget libmysqlclient-dev mariadb-client mariadb-common curl rlwrap redis-tools nano wkhtmltopdf python-pip vim sudo \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
RUN pip install --upgrade setuptools pip && rm -rf ~/.cache/pip
RUN useradd -ms /bin/bash -G sudo frappe && printf '# User rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe
@ -31,5 +29,5 @@ RUN pip install -e bench-repo && rm -rf ~/.cache/pip \
&& npm install -g yarn
USER frappe
ADD ./frappe-bench /home/frappe/frappe-bench
ADD --chown=frappe:frappe ./frappe-bench /home/frappe/frappe-bench
WORKDIR /home/frappe/frappe-bench