Refractoring, reducing layers

This commit is contained in:
Mendel Greenberg 2019-03-01 16:42:26 -05:00
parent 6609a8f200
commit 1be128b1f7
No known key found for this signature in database
GPG key ID: B26A7D2DF7DC6EF7

View file

@ -11,11 +11,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends iputils-ping gi
libffi-dev libssl-dev libjpeg8-dev redis-tools software-properties-common libxext6 xfonts-75dpi xfonts-base \
python-dev libfreetype6-dev liblcms2-dev libwebp-dev python-tk libsasl2-dev libldap2-dev libtiff5-dev \
python-setuptools tk8.6-dev wget libmysqlclient-dev mariadb-client curl rlwrap wkhtmltopdf python-pip sudo \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
RUN pip install --upgrade setuptools pip && rm -rf ~/.cache/pip
# Install Node.js and yarn
RUN curl https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.10.0-1nodesource1_amd64.deb > node.deb \
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
&& pip install --upgrade setuptools pip --no-cache \
&& curl https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.10.0-1nodesource1_amd64.deb > node.deb \
&& dpkg -i node.deb \
&& rm node.deb \
&& npm install -g yarn
@ -24,21 +22,15 @@ RUN curl https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.10.0-
RUN useradd -ms /bin/bash -G sudo frappe \
&& printf '# Sudo rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe
USER frappe
WORKDIR /home/frappe
# Install bench
RUN pip install -e git+https://github.com/frappe/bench.git#egg=bench --no-cache
USER frappe
# Add some bench files
COPY --chown=frappe:frappe ./frappe-bench /home/frappe/frappe-bench
USER root
# Install bench
RUN pip install -e git+https://github.com/frappe/bench.git#egg=bench \
&& rm -rf ~/.cache/pip
USER frappe
WORKDIR /home/frappe/frappe-bench
EXPOSE 8000
EXPOSE 9000
EXPOSE 6787
EXPOSE 8000 9000 6787
VOLUME [ "/home/frappe/frappe-bench" ]