From 177ca58af624daae4bb2385bbbbf819134bc693a Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 4 Mar 2020 02:52:36 +0000 Subject: [PATCH] add and implement install_app for worker image --- build/common/worker/install_app.sh | 13 +++++++++ build/erpnext-worker/Dockerfile | 45 ++--------------------------- build/erpnext-worker/v11.Dockerfile | 42 ++------------------------- build/erpnext-worker/v12.Dockerfile | 45 ++--------------------------- build/frappe-worker/Dockerfile | 2 ++ build/frappe-worker/v11.Dockerfile | 2 ++ build/frappe-worker/v12.Dockerfile | 2 ++ 7 files changed, 25 insertions(+), 126 deletions(-) create mode 100755 build/common/worker/install_app.sh diff --git a/build/common/worker/install_app.sh b/build/common/worker/install_app.sh new file mode 100755 index 00000000..4717312f --- /dev/null +++ b/build/common/worker/install_app.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +APP_NAME=${1} +APP_REPO=${2} + +cd /home/frappe/frappe-bench/ + +. env/bin/activate + +cd apps + +git clone --depth 1 -o upstream ${APP_REPO} +pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/APP_NAME \ No newline at end of file diff --git a/build/erpnext-worker/Dockerfile b/build/erpnext-worker/Dockerfile index 6d145d8c..88af72f6 100644 --- a/build/erpnext-worker/Dockerfile +++ b/build/erpnext-worker/Dockerfile @@ -1,44 +1,3 @@ -FROM bitnami/python:latest-prod +FROM frappe/frappe-worker:develop -RUN useradd -ms /bin/bash frappe -WORKDIR /home/frappe/frappe-bench -RUN install_packages \ - git \ - wkhtmltopdf \ - mariadb-client \ - gettext-base \ - wget \ - # for PDF - libssl-dev \ - fonts-cantarell \ - xfonts-75dpi \ - xfonts-base \ - # For psycopg2 - libpq-dev \ - build-essential - -# Install wkhtmltox correctly -RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb -RUN dpkg -i wkhtmltox_0.12.5-1.stretch_amd64.deb && rm wkhtmltox_0.12.5-1.stretch_amd64.deb - -RUN mkdir -p apps logs commands - -RUN virtualenv env \ - && . env/bin/activate \ - && cd apps \ - && git clone --depth 1 -o upstream https://github.com/frappe/frappe \ - && git clone --depth 1 -o upstream https://github.com/frappe/erpnext \ - && pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/frappe \ - && pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/erpnext - -COPY build/common/commands/* /home/frappe/frappe-bench/commands/ -COPY build/common/common_site_config.json.template /opt/frappe/common_site_config.json.template - -# Setup docker-entrypoint -COPY build/common/worker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh -RUN ln -s /usr/local/bin/docker-entrypoint.sh / # backwards compat - -WORKDIR /home/frappe/frappe-bench/sites - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["start"] +RUN install_app erpnext https://github.com/frappe/erpnext \ No newline at end of file diff --git a/build/erpnext-worker/v11.Dockerfile b/build/erpnext-worker/v11.Dockerfile index 81a59b63..9f6c9c2a 100644 --- a/build/erpnext-worker/v11.Dockerfile +++ b/build/erpnext-worker/v11.Dockerfile @@ -1,41 +1,3 @@ -FROM bitnami/python:latest-prod +FROM frappe/frappe-worker:v11 -RUN useradd -ms /bin/bash frappe -WORKDIR /home/frappe/frappe-bench -RUN install_packages \ - git \ - wkhtmltopdf \ - mariadb-client \ - gettext-base \ - wget \ - # for PDF - libssl-dev \ - fonts-cantarell \ - xfonts-75dpi \ - xfonts-base - -# Install wkhtmltox correctly -RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb -RUN dpkg -i wkhtmltox_0.12.5-1.stretch_amd64.deb && rm wkhtmltox_0.12.5-1.stretch_amd64.deb - -RUN mkdir -p apps logs commands - -RUN virtualenv env \ - && . env/bin/activate \ - && cd apps \ - && git clone --depth 1 -o upstream https://github.com/frappe/frappe --branch version-11 \ - && git clone --depth 1 -o upstream https://github.com/frappe/erpnext --branch version-11 \ - && pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/frappe \ - && pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/erpnext - -COPY build/common/commands/* /home/frappe/frappe-bench/commands/ -COPY build/common/common_site_config.json.template /opt/frappe/common_site_config.json.template - -# Setup docker-entrypoint -COPY build/common/worker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh -RUN ln -s /usr/local/bin/docker-entrypoint.sh / # backwards compat - -WORKDIR /home/frappe/frappe-bench/sites - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["start"] +RUN install_app erpnext https://github.com/frappe/erpnext \ No newline at end of file diff --git a/build/erpnext-worker/v12.Dockerfile b/build/erpnext-worker/v12.Dockerfile index 3945142a..734e9286 100644 --- a/build/erpnext-worker/v12.Dockerfile +++ b/build/erpnext-worker/v12.Dockerfile @@ -1,44 +1,3 @@ -FROM bitnami/python:latest-prod +FROM frappe/frappe-worker:v12 -RUN useradd -ms /bin/bash frappe -WORKDIR /home/frappe/frappe-bench -RUN install_packages \ - git \ - wkhtmltopdf \ - mariadb-client \ - gettext-base \ - wget \ - # for PDF - libssl-dev \ - fonts-cantarell \ - xfonts-75dpi \ - xfonts-base \ - # For psycopg2 - libpq-dev \ - build-essential - -# Install wkhtmltox correctly -RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb -RUN dpkg -i wkhtmltox_0.12.5-1.stretch_amd64.deb && rm wkhtmltox_0.12.5-1.stretch_amd64.deb - -RUN mkdir -p apps logs commands - -RUN virtualenv env \ - && . env/bin/activate \ - && cd apps \ - && git clone --depth 1 -o upstream https://github.com/frappe/frappe --branch version-12 \ - && git clone --depth 1 -o upstream https://github.com/frappe/erpnext --branch version-12 \ - && pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/frappe \ - && pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/erpnext - -COPY build/common/commands/* /home/frappe/frappe-bench/commands/ -COPY build/common/common_site_config.json.template /opt/frappe/common_site_config.json.template - -# Setup docker-entrypoint -COPY build/common/worker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh -RUN ln -s /usr/local/bin/docker-entrypoint.sh / # backwards compat - -WORKDIR /home/frappe/frappe-bench/sites - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["start"] +RUN install_app erpnext https://github.com/frappe/erpnext \ No newline at end of file diff --git a/build/frappe-worker/Dockerfile b/build/frappe-worker/Dockerfile index 41310b0d..40ce9c06 100644 --- a/build/frappe-worker/Dockerfile +++ b/build/frappe-worker/Dockerfile @@ -36,6 +36,8 @@ COPY build/common/common_site_config.json.template /opt/frappe/common_site_confi COPY build/common/worker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh RUN ln -s /usr/local/bin/docker-entrypoint.sh / # backwards compat +COPY build/common/worker/install_app.sh /usr/local/bin/install_app + WORKDIR /home/frappe/frappe-bench/sites ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/build/frappe-worker/v11.Dockerfile b/build/frappe-worker/v11.Dockerfile index fa2f01c5..335eb7a9 100644 --- a/build/frappe-worker/v11.Dockerfile +++ b/build/frappe-worker/v11.Dockerfile @@ -33,6 +33,8 @@ COPY build/common/common_site_config.json.template /opt/frappe/common_site_confi COPY build/common/worker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh RUN ln -s /usr/local/bin/docker-entrypoint.sh / # backwards compat +COPY build/common/worker/install_app.sh /usr/local/bin/install_app + WORKDIR /home/frappe/frappe-bench/sites ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/build/frappe-worker/v12.Dockerfile b/build/frappe-worker/v12.Dockerfile index 1eb6d60a..2f10db39 100644 --- a/build/frappe-worker/v12.Dockerfile +++ b/build/frappe-worker/v12.Dockerfile @@ -36,6 +36,8 @@ COPY build/common/common_site_config.json.template /opt/frappe/common_site_confi COPY build/common/worker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh RUN ln -s /usr/local/bin/docker-entrypoint.sh / # backwards compat +COPY build/common/worker/install_app.sh /usr/local/bin/install_app + WORKDIR /home/frappe/frappe-bench/sites ENTRYPOINT ["docker-entrypoint.sh"]