From 864d46e411a6d250ea5cd7f8d08e5297e5de64cc Mon Sep 17 00:00:00 2001 From: Sopanawit Pichidtienthum Date: Fri, 17 Aug 2018 09:35:01 +0700 Subject: [PATCH 1/8] Specific mariadb version to 10.2 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a8beba0b..d9dfe1f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mariadb: - image: "mariadb" + image: "mariadb:10.2" environment: - MYSQL_ROOT_PASSWORD=123 - MYSQL_USER=root From 632275596fdbb007c2ca6f0c043fda835a19a620 Mon Sep 17 00:00:00 2001 From: Sopanawit Pichidtienthum Date: Fri, 17 Aug 2018 09:51:47 +0700 Subject: [PATCH 2/8] Update Dockerfile to use ubuntu 18.04 as production and update some library to a newer version. --- Dockerfile | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7f5b9a14..4954b0a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,32 +2,36 @@ #bench Dockerfile FROM ubuntu:16.04 -MAINTAINER frappé +MAINTAINER Facgure USER root -RUN apt-get update +RUN apt-get update -y 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 DEBIAN_FRONTEND=noninteractive apt-get -yq install tzdata +RUN ln -fs /usr/share/zoneinfo/Asia/Bangkok /etc/localtime +RUN dpkg-reconfigure --frontend noninteractive tzdata + 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 -RUN apt-get install -y wget +RUN apt-get install -y wget wkhtmltopdf curl rlwrap vim + RUN wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py RUN pip install --upgrade setuptools pip + +# Add user frappe and set as sudoers +RUN apt-get install -y sudo RUN useradd -ms /bin/bash frappe -RUN apt-get install -y curl -RUN apt-get install -y rlwrap -RUN apt-get install redis-tools -RUN apt-get install -y nano +RUN usermod -aG sudo frappe +RUN 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 #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 \ - && dpkg -i node.deb \ - && rm node.deb -RUN apt-get install -y wkhtmltopdf +RUN curl --silent --location https://deb.nodesource.com/setup_8.x | bash - +RUN apt-get install -y nodejs USER frappe WORKDIR /home/frappe @@ -40,4 +44,4 @@ RUN npm install -g yarn RUN chown -R frappe:frappe /home/frappe/* USER frappe -WORKDIR /home/frappe/frappe-bench +WORKDIR /home/frappe/frappe-bench \ No newline at end of file From 1422b9f6b7532aecd95865f6403f7d29675cbf44 Mon Sep 17 00:00:00 2001 From: sopanawit <41313215+sopanawit@users.noreply.github.com> Date: Fri, 17 Aug 2018 09:54:23 +0700 Subject: [PATCH 3/8] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4954b0a5..35545dee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ #bench Dockerfile -FROM ubuntu:16.04 +FROM ubuntu:18.04 MAINTAINER Facgure USER root @@ -44,4 +44,4 @@ RUN npm install -g yarn RUN chown -R frappe:frappe /home/frappe/* USER frappe -WORKDIR /home/frappe/frappe-bench \ No newline at end of file +WORKDIR /home/frappe/frappe-bench From 7501e0a8a6006521f0ae6c65fd767d158ef5c52a Mon Sep 17 00:00:00 2001 From: sopanawit <41313215+sopanawit@users.noreply.github.com> Date: Fri, 17 Aug 2018 09:55:32 +0700 Subject: [PATCH 4/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 35545dee..b18d5bed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ #bench Dockerfile FROM ubuntu:18.04 -MAINTAINER Facgure +MAINTAINER frappé USER root RUN apt-get update -y From cedbccf86b66a498debba2928750893bfad566d5 Mon Sep 17 00:00:00 2001 From: sopanawit <41313215+sopanawit@users.noreply.github.com> Date: Fri, 17 Aug 2018 09:54:23 +0700 Subject: [PATCH 5/8] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4954b0a5..35545dee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ #bench Dockerfile -FROM ubuntu:16.04 +FROM ubuntu:18.04 MAINTAINER Facgure USER root @@ -44,4 +44,4 @@ RUN npm install -g yarn RUN chown -R frappe:frappe /home/frappe/* USER frappe -WORKDIR /home/frappe/frappe-bench \ No newline at end of file +WORKDIR /home/frappe/frappe-bench From 264e3e3b7c8f54438504688492fdf52918a3254f Mon Sep 17 00:00:00 2001 From: sopanawit <41313215+sopanawit@users.noreply.github.com> Date: Fri, 17 Aug 2018 09:55:32 +0700 Subject: [PATCH 6/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 35545dee..b18d5bed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ #bench Dockerfile FROM ubuntu:18.04 -MAINTAINER Facgure +MAINTAINER frappé USER root RUN apt-get update -y From 6f125f1b0242556b4039bb4824ff60afb6ba0f19 Mon Sep 17 00:00:00 2001 From: Sopanawit Pichidtienthum Date: Fri, 17 Aug 2018 10:05:34 +0700 Subject: [PATCH 7/8] Rebase Dockerfile (commit to wrong branch) --- Dockerfile | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index b18d5bed..debc0e4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,37 +1,33 @@ #bench Dockerfile -FROM ubuntu:18.04 +FROM ubuntu:16.04 MAINTAINER frappé USER root -RUN apt-get update -y +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 DEBIAN_FRONTEND=noninteractive apt-get -yq install tzdata -RUN ln -fs /usr/share/zoneinfo/Asia/Bangkok /etc/localtime -RUN dpkg-reconfigure --frontend noninteractive tzdata - 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 -RUN apt-get install -y wget wkhtmltopdf curl rlwrap vim - +RUN apt-get install -y wget RUN wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py RUN pip install --upgrade setuptools pip - -# Add user frappe and set as sudoers -RUN apt-get install -y sudo RUN useradd -ms /bin/bash frappe -RUN usermod -aG sudo frappe -RUN printf '# User rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe +RUN apt-get install -y curl +RUN apt-get install -y rlwrap +RUN apt-get install redis-tools +RUN apt-get install -y nano # Generate locale C.UTF-8 for mariadb and general locale data ENV LANG C.UTF-8 #nodejs -RUN curl --silent --location https://deb.nodesource.com/setup_8.x | bash - -RUN apt-get install -y 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 \ + && dpkg -i node.deb \ + && rm node.deb +RUN apt-get install -y wkhtmltopdf USER frappe WORKDIR /home/frappe @@ -44,4 +40,4 @@ RUN npm install -g yarn RUN chown -R frappe:frappe /home/frappe/* USER frappe -WORKDIR /home/frappe/frappe-bench +WORKDIR /home/frappe/frappe-bench \ No newline at end of file From f4bb86d80886d0d0458f2c8c987cd7bd190b5d22 Mon Sep 17 00:00:00 2001 From: Sopanawit Pichidtienthum Date: Fri, 17 Aug 2018 10:09:15 +0700 Subject: [PATCH 8/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index debc0e4f..7f5b9a14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,4 +40,4 @@ RUN npm install -g yarn RUN chown -R frappe:frappe /home/frappe/* USER frappe -WORKDIR /home/frappe/frappe-bench \ No newline at end of file +WORKDIR /home/frappe/frappe-bench