From 05fda942201f8be3a97d58b94b12f38d5c907687 Mon Sep 17 00:00:00 2001 From: chabad360 Date: Fri, 5 Oct 2018 11:50:11 -0700 Subject: [PATCH] dockerfile: clean up (#52) * Condensed Dockerfile Updated to latest node, and uses python-pip, also condensed a lot the Dockerfile. --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2dfdf5f9..eaf29640 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,13 +5,13 @@ FROM ubuntu:16.04 LABEL MAINTAINER frappé USER root +RUN useradd -ms /bin/bash frappe RUN apt-get update -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 \ - 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 +RUN apt-get install -y iputils-ping git build-essential python-setuptools python-dev libffi-dev libssl-dev \ + redis-tools redis-server software-properties-common libxrender1 libxext6 xfonts-75dpi xfonts-base \ + 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 wget libmysqlclient-dev mariadb-client mariadb-common curl rlwrap redis-tools nano wkhtmltopdf python-pip RUN pip install --upgrade setuptools pip -RUN useradd -ms /bin/bash -G sudo frappe && printf '# User rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe # Generate locale C.UTF-8 for mariadb and general locale data ENV LANG C.UTF-8 @@ -29,6 +29,6 @@ USER root RUN pip install -e bench-repo \ && npm install -g yarn \ && chown -R frappe:frappe /home/frappe/* - + USER frappe WORKDIR /home/frappe/frappe-bench