refactor: reuse common scripts and files

move common scripts to build/common

.travis.yml

@@ -34,26 +34,26 @@ matrix:
         - ./dbench setup docker stop
     - name: "Build Frappe python environment"
       script:
-        - docker build -t frappe-worker build/frappe-worker
+        - docker build -t frappe-worker -f build/frappe-worker/Dockerfile .
         - docker tag frappe-worker frappe/frappe-worker:edge
         - docker push frappe/frappe-worker:edge
     - name: "Build Frappe nginx + static assets"
       script:
-        - docker build -t frappe-assets build/frappe-assets
+        - docker build -t frappe-assets -f build/frappe-assets/Dockerfile .
         - docker tag frappe-assets frappe/frappe-assets:edge
         - docker push frappe/frappe-assets:edge
     - name: "Build ERPNext python environment"
       script:
-        - docker build -t erpnext-worker build/erpnext-worker
+        - docker build -t erpnext-worker -f build/erpnext-worker/Dockerfile .
         - docker tag erpnext-worker frappe/erpnext-worker:edge
         - docker push frappe/erpnext-worker:edge
     - name: "Build ERPNext nginx + static assets"
       script:
-        - docker build -t erpnext-assets build/erpnext-assets
+        - docker build -t erpnext-assets -f build/erpnext-assets/Dockerfile .
         - docker tag erpnext-assets frappe/erpnext-assets:edge
         - docker push frappe/erpnext-assets:edge
     - name: "Build Frappe socketio service"
       script:
-        - docker build -t frappe-socketio build/frappe-socketio
+        - docker build -t frappe-socketio -f build/frappe-socketio/Dockerfile .
         - docker tag frappe-socketio frappe/frappe-socketio:edge
         - docker push frappe/frappe-socketio:edge

build/erpnext-assets/.dockerignore

@@ -1,2 +0,0 @@
-Dockerfile
-/docker/

build/erpnext-assets/Dockerfile

@@ -1,7 +1,8 @@
 FROM bitnami/node:12-prod
 
 WORKDIR /home/frappe/frappe-bench
-COPY sites/apps.txt /home/frappe/frappe-bench/sites/apps.txt
+RUN mkdir -p /home/frappe/frappe-bench/sites \
+    && echo "frappe\nerpnext" > /home/frappe/frappe-bench/sites/apps.txt
 
 RUN install_packages git
 
@@ -18,18 +19,18 @@ RUN cd /home/frappe/frappe-bench/apps/frappe \
 
 RUN git clone --depth 1 https://github.com/frappe/bench /tmp/bench \
     && mkdir -p /var/www/error_pages \
-    && mkdir -p /home/frappe/frappe-bench/sites/assets/erpnext \
+    && cp -r /tmp/bench/bench/config/templates/502.html /var/www/error_pages
-    && cp -r /tmp/bench/bench/config/templates /var/www/error_pages
 
 RUN cp -R /home/frappe/frappe-bench/apps/frappe/frappe/public/* /home/frappe/frappe-bench/sites/assets/frappe \
     && cp -R /home/frappe/frappe-bench/apps/frappe/node_modules /home/frappe/frappe-bench/sites/assets/frappe/ \
+    && mkdir -p /home/frappe/frappe-bench/sites/assets/erpnext \
     && cp -R /home/frappe/frappe-bench/apps/erpnext/erpnext/public/* /home/frappe/frappe-bench/sites/assets/erpnext
 
 FROM nginx:latest
 COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
 COPY --from=0 /var/www/error_pages /var/www/
-COPY nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
+COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
-COPY docker-entrypoint.sh /
+COPY build/erpnext-assets/docker-entrypoint.sh /
 
 RUN apt-get update && apt-get install -y rsync && apt-get clean
 

build/erpnext-assets/sites/apps.txt

@@ -1,2 +0,0 @@
-frappe
-erpnext

build/erpnext-assets/v11.Dockerfile

@@ -1,7 +1,8 @@
 FROM bitnami/node:10-prod
 
 WORKDIR /home/frappe/frappe-bench
-COPY sites/apps.txt /home/frappe/frappe-bench/sites/apps.txt
+RUN mkdir -p /home/frappe/frappe-bench/sites \
+    && echo -e "frappe\nerpnext" > /home/frappe/frappe-bench/sites/apps.txt
 
 RUN install_packages git
 
@@ -18,18 +19,19 @@ RUN cd /home/frappe/frappe-bench/apps/frappe \
 
 RUN git clone --depth 1 https://github.com/frappe/bench /tmp/bench \
     && mkdir -p /var/www/error_pages \
-    && mkdir -p /home/frappe/frappe-bench/sites/assets/erpnext
+    && cp -r /tmp/bench/bench/config/templates/502.html /var/www/error_pages
 
 RUN cp -R /home/frappe/frappe-bench/apps/frappe/frappe/public/* /home/frappe/frappe-bench/sites/assets/frappe \
     && cp -R /home/frappe/frappe-bench/apps/frappe/node_modules /home/frappe/frappe-bench/sites/assets/frappe/ \
     && cp -R /home/frappe/frappe-bench/apps/erpnext/erpnext/public/* /home/frappe/frappe-bench/sites/assets/erpnext \
+    && mkdir -p /home/frappe/frappe-bench/sites/assets/erpnext \
     && cp -r /tmp/bench/bench/config/templates /var/www/error_pages
 
 FROM nginx:latest
 COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
 COPY --from=0 /var/www/error_pages /var/www/
-COPY nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
+COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
-COPY docker-entrypoint.sh /
+COPY build/erpnext-assets/docker-entrypoint.sh /
 
 RUN apt-get update && apt-get install -y rsync && apt-get clean
 

build/erpnext-assets/v12.Dockerfile

@@ -1,7 +1,8 @@
 FROM bitnami/node:12-prod
 
 WORKDIR /home/frappe/frappe-bench
-COPY sites/apps.txt /home/frappe/frappe-bench/sites/apps.txt
+RUN mkdir -p /home/frappe/frappe-bench/sites \
+    && echo -e "frappe\nerpnext" > /home/frappe/frappe-bench/sites/apps.txt
 
 RUN install_packages git
 
@@ -18,18 +19,19 @@ RUN cd /home/frappe/frappe-bench/apps/frappe \
 
 RUN git clone --depth 1 https://github.com/frappe/bench /tmp/bench \
     && mkdir -p /var/www/error_pages \
-    && mkdir -p /home/frappe/frappe-bench/sites/assets/erpnext
+    && cp -r /tmp/bench/bench/config/templates/502.html /var/www/error_pages
 
 RUN cp -R /home/frappe/frappe-bench/apps/frappe/frappe/public/* /home/frappe/frappe-bench/sites/assets/frappe \
     && cp -R /home/frappe/frappe-bench/apps/frappe/node_modules /home/frappe/frappe-bench/sites/assets/frappe/ \
     && cp -R /home/frappe/frappe-bench/apps/erpnext/erpnext/public/* /home/frappe/frappe-bench/sites/assets/erpnext \
+    && mkdir -p /home/frappe/frappe-bench/sites/assets/erpnext \
     && cp -r /tmp/bench/bench/config/templates /var/www/error_pages
 
 FROM nginx:latest
 COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
 COPY --from=0 /var/www/error_pages /var/www/
-COPY nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
+COPY build/erpnext-assets/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
-COPY docker-entrypoint.sh /
+COPY build/common/docker-entrypoint.sh /
 
 RUN apt-get update && apt-get install -y rsync && apt-get clean
 

build/erpnext-worker/Dockerfile

@@ -31,11 +31,11 @@ RUN virtualenv env \
     && 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 ./commands/* /home/frappe/frappe-bench/commands/
+COPY build/common/commands/* /home/frappe/frappe-bench/commands/
-COPY ./common_site_config.json.template /opt/frappe/common_site_config.json.template
+COPY build/common/common_site_config.json.template /opt/frappe/common_site_config.json.template
 
 # Setup docker-entrypoint
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+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

build/erpnext-worker/commands/new.py

@@ -1,68 +0,0 @@
-import os, frappe, json
-
-from frappe.commands.site import _new_site
-
-site_name = os.environ.get("SITE_NAME", 'site1.localhost')
-mariadb_root_username = os.environ.get("DB_ROOT_USER", 'root')
-mariadb_root_password = os.environ.get("DB_ROOT_PASSWORD", 'admin')
-install_erpnext = os.environ.get("INSTALL_ERPNEXT", None)
-force = True if os.environ.get("FORCE", None) else False
-
-frappe.init(site_name, new_site=True)
-
-_new_site(
-    None,
-    site_name,
-    mariadb_root_username=mariadb_root_username,
-    mariadb_root_password=mariadb_root_password,
-    admin_password=os.environ.get("ADMIN_PASSWORD", 'admin'),
-    verbose=True,
-    install_apps=['erpnext'] if install_erpnext else [],
-    source_sql=None,
-    force=force,
-    reinstall=False,
-)
-
-config = None
-with open('common_site_config.json') as config_file:
-    config = json.load(config_file)
-
-site_config = None
-with open('{site_name}/site_config.json'.format(site_name=site_name)) as site_config_file:
-    site_config = json.load(site_config_file)
-
-# update User's host to '%' required to connect from any container
-command = 'mysql -h{db_host} -u{mariadb_root_username} -p{mariadb_root_password} -e '.format(
-    db_host=config.get('db_host'),
-    mariadb_root_username=mariadb_root_username,
-    mariadb_root_password=mariadb_root_password
-)
-command += "\"UPDATE mysql.user SET Host = '%' where User = '{db_name}'; FLUSH PRIVILEGES;\"".format(
-    db_name=site_config.get('db_name')
-)
-os.system(command)
-
-# Set db password
-command = 'mysql -h{db_host} -u{mariadb_root_username} -p{mariadb_root_password} -e '.format(
-    db_host=config.get('db_host'),
-    mariadb_root_username=mariadb_root_username,
-    mariadb_root_password=mariadb_root_password
-)
-command += "\"SET PASSWORD FOR '{db_name}'@'%' = PASSWORD('{db_password}'); FLUSH PRIVILEGES;\"".format(
-    db_name=site_config.get('db_name'),
-    db_password=site_config.get('db_password')
-)
-os.system(command)
-
-# Grant permission to database
-command = 'mysql -h{db_host} -u{mariadb_root_username} -p{mariadb_root_password} -e '.format(
-    db_host=config.get('db_host'),
-    mariadb_root_username=mariadb_root_username,
-    mariadb_root_password=mariadb_root_password
-)
-command += "\"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%'; FLUSH PRIVILEGES;\"".format(
-    db_name=site_config.get('db_name')
-)
-os.system(command)
-
-exit(0)

build/erpnext-worker/docker-entrypoint.sh

@@ -1,158 +0,0 @@
-#!/bin/bash
-
-function configureEnv() {
-  if [ ! -f /home/frappe/frappe-bench/sites/common_site_config.json ]; then
-
-    if [[ -z "$MARIADB_HOST" ]]; then
-      echo "MARIADB_HOST is not set"
-      exit 1
-    fi
-
-    if [[ -z "$REDIS_CACHE" ]]; then
-      echo "REDIS_CACHE is not set"
-      exit 1
-    fi
-
-    if [[ -z "$REDIS_QUEUE" ]]; then
-      echo "REDIS_QUEUE is not set"
-      exit 1
-    fi
-
-    if [[ -z "$REDIS_SOCKETIO" ]]; then
-      echo "REDIS_SOCKETIO is not set"
-      exit 1
-    fi
-
-    if [[ -z "$SOCKETIO_PORT" ]]; then
-      echo "SOCKETIO_PORT is not set"
-      exit 1
-    fi
-
-    envsubst "${MARIADB_HOST}
-      ${REDIS_CACHE}
-      ${REDIS_QUEUE}
-      ${REDIS_SOCKETIO}
-      ${SOCKETIO_PORT}" < /opt/frappe/common_site_config.json.template > /home/frappe/frappe-bench/sites/common_site_config.json
-  fi
-}
-
-function checkConnection() {
-  su frappe -c ". /home/frappe/frappe-bench/env/bin/activate \
-    && python /home/frappe/frappe-bench/commands/check_connection.py"
-}
-
-function checkConfigExists() {
-  COUNTER=0
-  while [[ ! -e /home/frappe/frappe-bench/sites/common_site_config.json ]] && [[ $COUNTER -le 30 ]] ; do
-      sleep 1
-      (( COUNTER=COUNTER+1 ))
-      echo "config file not created, retry $COUNTER"
-  done
-
-  if [[ ! -e /home/frappe/frappe-bench/sites/common_site_config.json ]]; then
-    echo "timeout: config file not created"
-    exit 1
-  fi
-}
-
-if [[ ! -e /home/frappe/frappe-bench/sites/apps.txt ]]; then
-  find /home/frappe/frappe-bench/apps -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | sort -r > /home/frappe/frappe-bench/sites/apps.txt
-fi
-
-if [ "$1" = 'start' ]; then
-  configureEnv
-  checkConnection
-
-  chown frappe:frappe /home/frappe/frappe-bench/sites/common_site_config.json
-
-  if [[ -z "$WORKERS" ]]; then
-    export WORKERS=2
-  fi
-
-  if [[ -z "$FRAPPE_PORT" ]]; then
-    export FRAPPE_PORT=8000
-  fi
-
-
-  if [[ -z "$RUN_AS_ROOT" ]]; then
-    su frappe -c ". /home/frappe/frappe-bench/env/bin/activate \
-      && gunicorn -b 0.0.0.0:$FRAPPE_PORT \
-      --worker-tmp-dir /dev/shm \
-      --threads=4 \
-      --workers $WORKERS \
-      --worker-class=gthread \
-      --log-file=- \
-      -t 120 frappe.app:application --preload"
-  else
-    . /home/frappe/frappe-bench/env/bin/activate
-    gunicorn -b 0.0.0.0:$FRAPPE_PORT \
-      --worker-tmp-dir /dev/shm \
-      --threads=4 \
-      --workers $WORKERS \
-      --worker-class=gthread \
-      --log-file=- \
-      -t 120 frappe.app:application --preload
-  fi
-
-elif [ "$1" = 'worker' ]; then
-  checkConfigExists
-  checkConnection
-  # default WORKER_TYPE=default
-  if [[ -z "$RUN_AS_ROOT" ]]; then
-    su frappe -c ". /home/frappe/frappe-bench/env/bin/activate \
-      && python /home/frappe/frappe-bench/commands/worker.py"
-  else
-    . /home/frappe/frappe-bench/env/bin/activate
-    python /home/frappe/frappe-bench/commands/worker.py
-  fi
-
-elif [ "$1" = 'schedule' ]; then
-  checkConfigExists
-  checkConnection
-  if [[ -z "$RUN_AS_ROOT" ]]; then
-    su frappe -c ". /home/frappe/frappe-bench/env/bin/activate \
-      && python /home/frappe/frappe-bench/commands/background.py"
-  else
-    . /home/frappe/frappe-bench/env/bin/activate
-    python /home/frappe/frappe-bench/commands/background.py
-  fi
-
-elif [ "$1" = 'new' ]; then
-
-  if [[ -z "$RUN_AS_ROOT" ]]; then
-    su frappe -c ". /home/frappe/frappe-bench/env/bin/activate \
-      && python /home/frappe/frappe-bench/commands/new.py"
-    exit
-  else
-    . /home/frappe/frappe-bench/env/bin/activate
-    python /home/frappe/frappe-bench/commands/new.py
-  fi
-
-elif [ "$1" = 'migrate' ]; then
-
-  su frappe -c ". /home/frappe/frappe-bench/env/bin/activate \
-    && python /home/frappe/frappe-bench/commands/migrate.py"
-  exit
-
-elif [ "$1" = 'doctor' ]; then
-
-  su frappe -c ". /home/frappe/frappe-bench/env/bin/activate \
-    && python /home/frappe/frappe-bench/commands/doctor.py"
-  exit
-
-elif [ "$1" = 'backup' ]; then
-
-  if [[ -z "$RUN_AS_ROOT" ]]; then
-    su frappe -c ". /home/frappe/frappe-bench/env/bin/activate \
-      && python /home/frappe/frappe-bench/commands/backup.py"
-    exit
-  else
-    . /home/frappe/frappe-bench/env/bin/activate
-    python /home/frappe/frappe-bench/commands/backup.py
-  fi
-
-else
-
-  exec su frappe -c "$@"
-
-fi

build/erpnext-worker/v11.Dockerfile

@@ -28,11 +28,11 @@ RUN virtualenv env \
     && 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 ./commands/* /home/frappe/frappe-bench/commands/
+COPY build/common/commands/* /home/frappe/frappe-bench/commands/
-COPY ./common_site_config.json.template /opt/frappe/common_site_config.json.template
+COPY build/common/common_site_config.json.template /opt/frappe/common_site_config.json.template
 
 # Setup docker-entrypoint
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+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

build/erpnext-worker/v12.Dockerfile

@@ -31,11 +31,11 @@ RUN virtualenv env \
     && 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 ./commands/* /home/frappe/frappe-bench/commands/
+COPY build/common/commands/* /home/frappe/frappe-bench/commands/
-COPY ./common_site_config.json.template /opt/frappe/common_site_config.json.template
+COPY build/common/common_site_config.json.template /opt/frappe/common_site_config.json.template
 
 # Setup docker-entrypoint
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+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

build/frappe-assets/.dockerignore

@@ -1,2 +0,0 @@
-Dockerfile
-/docker/

build/frappe-assets/Dockerfile

@@ -1,7 +1,8 @@
 FROM bitnami/node:12-prod
 
 WORKDIR /home/frappe/frappe-bench
-COPY sites/apps.txt /home/frappe/frappe-bench/sites/apps.txt
+RUN mkdir -p /home/frappe/frappe-bench/sites \
+    && echo "frappe" > /home/frappe/frappe-bench/sites/apps.txt
 
 RUN install_packages git
 
@@ -25,8 +26,8 @@ RUN cp -R /home/frappe/frappe-bench/apps/frappe/frappe/public/* /home/frappe/fra
 FROM nginx:latest
 COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
 COPY --from=0 /var/www/error_pages /var/www/
-COPY nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
+COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
-COPY docker-entrypoint.sh /
+COPY build/frappe-assets/docker-entrypoint.sh /
 
 RUN apt-get update && apt-get install -y rsync && apt-get clean
 

build/frappe-assets/nginx-default.conf.template

@@ -1,90 +0,0 @@
-upstream frappe-server {
-    server ${FRAPPE_PY}:${FRAPPE_PY_PORT} fail_timeout=0;
-}
-
-upstream socketio-server {
-    server ${FRAPPE_SOCKETIO}:${FRAPPE_SOCKETIO_PORT} fail_timeout=0;
-}
-
-server {
-    listen 80;
-    server_name $http_host;
-    root /var/www/html;
-
-    location /assets {
-        try_files $uri =404;
-    }
-
-    location ~ ^/protected/(.*) {
-        internal;
-        try_files /sites/$http_host/$1 =404;
-    }
-
-    location /socket.io {
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_set_header X-Frappe-Site-Name $http_host;
-        proxy_set_header Origin $scheme://$http_host;
-        proxy_set_header Host $host;
-
-        proxy_pass http://socketio-server;
-    }
-
-    location / {
-        try_files /sites/$http_host/public/$uri @webserver;
-    }
-
-    location @webserver {
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Frappe-Site-Name $http_host;
-        proxy_set_header Host $host;
-        proxy_set_header X-Use-X-Accel-Redirect True;
-        proxy_read_timeout 120;
-        proxy_redirect off;
-
-        proxy_pass  http://frappe-server;
-    }
-
-    # error pages
-    error_page 502 /502.html;
-    location /502.html {
-        root /var/www/templates;
-        internal;
-    }
-
-    # optimizations
-    sendfile on;
-    keepalive_timeout 15;
-    client_max_body_size 50m;
-    client_body_buffer_size 16K;
-    client_header_buffer_size 1k;
-
-    # enable gzip compresion
-    # based on https://mattstauffer.co/blog/enabling-gzip-on-nginx-servers-including-laravel-forge
-    gzip on;
-    gzip_http_version 1.1;
-    gzip_comp_level 5;
-    gzip_min_length 256;
-    gzip_proxied any;
-    gzip_vary on;
-    gzip_types
-        application/atom+xml
-        application/javascript
-        application/json
-        application/rss+xml
-        application/vnd.ms-fontobject
-        application/x-font-ttf
-        application/font-woff
-        application/x-web-app-manifest+json
-        application/xhtml+xml
-        application/xml
-        font/opentype
-        image/svg+xml
-        image/x-icon
-        text/css
-        text/plain
-        text/x-component;
-        # text/html is always compressed by HttpGzipModule
-}

build/frappe-assets/sites/apps.txt

@@ -1 +0,0 @@
-frappe

build/frappe-assets/v11.Dockerfile

@@ -1,7 +1,8 @@
 FROM bitnami/node:10-prod
 
 WORKDIR /home/frappe/frappe-bench
-COPY sites/apps.txt /home/frappe/frappe-bench/sites/apps.txt
+RUN mkdir -p /home/frappe/frappe-bench/sites \
+    && echo "frappe" > /home/frappe/frappe-bench/sites/apps.txt
 
 RUN install_packages git
 
@@ -25,8 +26,8 @@ RUN cp -R /home/frappe/frappe-bench/apps/frappe/frappe/public/* /home/frappe/fra
 FROM nginx:latest
 COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
 COPY --from=0 /var/www/error_pages /var/www/
-COPY nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
+COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
-COPY docker-entrypoint.sh /
+COPY build/frappe-assets/docker-entrypoint.sh /
 
 RUN apt-get update && apt-get install -y rsync && apt-get clean
 

build/frappe-assets/v12.Dockerfile

@@ -1,7 +1,8 @@
 FROM bitnami/node:12-prod
 
 WORKDIR /home/frappe/frappe-bench
-COPY sites/apps.txt /home/frappe/frappe-bench/sites/apps.txt
+RUN mkdir -p /home/frappe/frappe-bench/sites \
+    && echo "frappe" > /home/frappe/frappe-bench/sites/apps.txt
 
 RUN install_packages git
 
@@ -25,8 +26,8 @@ RUN cp -R /home/frappe/frappe-bench/apps/frappe/frappe/public/* /home/frappe/fra
 FROM nginx:latest
 COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
 COPY --from=0 /var/www/error_pages /var/www/
-COPY nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
+COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
-COPY docker-entrypoint.sh /
+COPY build/frappe-assets/docker-entrypoint.sh /
 
 RUN apt-get update && apt-get install -y rsync && apt-get clean
 

build/frappe-socketio/Dockerfile

@@ -8,7 +8,7 @@ RUN useradd -ms /bin/bash frappe
 # Make bench directories
 RUN mkdir -p /home/frappe/frappe-bench/sites /home/frappe/frappe-bench/apps/frappe
 
-COPY package.json /home/frappe/frappe-bench/apps/frappe
+COPY build/frappe-socketio/package.json /home/frappe/frappe-bench/apps/frappe
 
 
 # get socketio
@@ -21,11 +21,11 @@ RUN cd /home/frappe/frappe-bench/apps/frappe \
 RUN cd /home/frappe/frappe-bench/apps/frappe \
     && npm install --only=production
 
-COPY health.js /home/frappe/frappe-bench/apps/frappe/health.js
+COPY build/frappe-socketio/health.js /home/frappe/frappe-bench/apps/frappe/health.js
 RUN chown -R frappe:frappe /home/frappe
 
 # Setup docker-entrypoint
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY build/frappe-socketio/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

build/frappe-socketio/v11.Dockerfile

@@ -8,7 +8,7 @@ RUN useradd -ms /bin/bash frappe
 # Make bench directories
 RUN mkdir -p /home/frappe/frappe-bench/sites /home/frappe/frappe-bench/apps/frappe
 
-COPY package.json /home/frappe/frappe-bench/apps/frappe
+COPY build/frappe-socketio/package.json /home/frappe/frappe-bench/apps/frappe
 
 
 # get socketio
@@ -21,11 +21,11 @@ RUN cd /home/frappe/frappe-bench/apps/frappe \
 RUN cd /home/frappe/frappe-bench/apps/frappe \
     && npm install --only=production
 
-COPY health.js /home/frappe/frappe-bench/apps/frappe/health.js
+COPY build/frappe-socketio/health.js /home/frappe/frappe-bench/apps/frappe/health.js
 RUN chown -R frappe:frappe /home/frappe
 
 # Setup docker-entrypoint
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY build/frappe-socketio/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

build/frappe-socketio/v12.Dockerfile

@@ -8,7 +8,7 @@ RUN useradd -ms /bin/bash frappe
 # Make bench directories
 RUN mkdir -p /home/frappe/frappe-bench/sites /home/frappe/frappe-bench/apps/frappe
 
-COPY package.json /home/frappe/frappe-bench/apps/frappe
+COPY build/frappe-socketio/package.json /home/frappe/frappe-bench/apps/frappe
 
 
 # get socketio
@@ -21,11 +21,11 @@ RUN cd /home/frappe/frappe-bench/apps/frappe \
 RUN cd /home/frappe/frappe-bench/apps/frappe \
     && npm install --only=production
 
-COPY health.js /home/frappe/frappe-bench/apps/frappe/health.js
+COPY build/frappe-socketio/health.js /home/frappe/frappe-bench/apps/frappe/health.js
 RUN chown -R frappe:frappe /home/frappe
 
 # Setup docker-entrypoint
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY build/frappe-socketio/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

build/frappe-worker/Dockerfile

@@ -29,11 +29,11 @@ RUN virtualenv env \
     && git clone --depth 1 -o upstream https://github.com/frappe/frappe \
     && pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/frappe
 
-COPY ./commands/* /home/frappe/frappe-bench/commands/
+COPY build/common/commands/* /home/frappe/frappe-bench/commands/
-COPY ./common_site_config.json.template /opt/frappe/common_site_config.json.template
+COPY build/common/common_site_config.json.template /opt/frappe/common_site_config.json.template
 
 # Setup docker-entrypoint
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+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

build/frappe-worker/commands/background.py

@@ -1,7 +0,0 @@
-import frappe
-from frappe.utils.scheduler import start_scheduler
-
-print("Starting background scheduler . . .")
-start_scheduler()
-
-exit(0)

build/frappe-worker/commands/backup.py

@@ -1,29 +0,0 @@
-import os, frappe, compileall, re
-from frappe.utils.backups import scheduled_backup
-from frappe.utils import now
-from frappe.utils import get_sites
-
-def backup(sites, with_files=False):
-    for site in sites:
-        frappe.init(site)
-        frappe.connect()
-        odb = scheduled_backup(
-            ignore_files=not with_files,
-            backup_path_db=None,
-            backup_path_files=None,
-            backup_path_private_files=None,
-            force=True
-        )
-        print("database backup taken -", odb.backup_path_db, "- on", now())
-        if with_files:
-            print("files backup taken -", odb.backup_path_files, "- on", now())
-            print("private files backup taken -", odb.backup_path_private_files, "- on", now())
-        frappe.destroy()
-
-installed_sites = ":".join(get_sites())
-sites = os.environ.get("SITES", installed_sites).split(":")
-with_files=True if os.environ.get("WITH_FILES") else False
-
-backup(sites, with_files)
-
-exit(0)

build/frappe-worker/commands/check_connection.py

@@ -1,67 +0,0 @@
-import socket, os, json, time
-from six.moves.urllib.parse import urlparse
-
-def is_open(ip, port, timeout=30):
-    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    s.settimeout(timeout)
-    try:
-        s.connect((ip, int(port)))
-        s.shutdown(socket.SHUT_RDWR)
-        return True
-    except:
-        return False
-    finally:
-        s.close()
-
-def check_host(ip, port, retry=10, delay=3):
-    ipup = False
-    for i in range(retry):
-        print("Attempt {i} to connect to {ip}:{port}".format(ip=ip,port=port,i=i+1))
-        if is_open(ip, port):
-            ipup = True
-            break
-        else:
-            time.sleep(delay)
-    return ipup
-
-# Check connection to servers
-config = None
-try:
-    with open('common_site_config.json') as config_file:
-        config = json.load(config_file)
-except FileNotFoundError:
-    raise FileNotFoundError("common_site_config.json missing")
-except:
-    raise ValueError("common_site_config.json is not valid")
-
-# Check mariadb
-check_mariadb = False
-check_mariadb = check_host(config.get('db_host', 'mariadb'), 3306)
-if not check_mariadb:
-    raise ConnectionError("Connection to mariadb timed out")
-
-# Check redis queue
-check_redis_queue = False
-redis_queue_url = urlparse(config.get("redis_queue","redis://redis:6379")).netloc
-redis_queue, redis_queue_port = redis_queue_url.split(":")
-check_redis_queue = check_host(redis_queue, redis_queue_port)
-if not check_redis_queue:
-    raise ConnectionError("Connection to redis queue timed out")
-
-# Check redis cache
-check_redis_cache = False
-redis_cache_url = urlparse(config.get("redis_cache","redis://redis:6379")).netloc
-redis_cache, redis_cache_port = redis_cache_url.split(":")
-check_redis_cache = check_host(redis_cache, redis_cache_port)
-if not check_redis_cache:
-    raise ConnectionError("Connection to redis cache timed out")
-
-# Check redis socketio
-check_redis_socketio = False
-redis_socketio_url = urlparse(config.get("redis_socketio","redis://redis:6379")).netloc
-redis_socketio, redis_socketio_port = redis_socketio_url.split(":")
-check_redis_socketio = check_host(redis_socketio, redis_socketio_port)
-if not check_redis_socketio:
-    raise ConnectionError("Connection to redis socketio timed out")
-
-print('Connections OK')

build/frappe-worker/commands/doctor.py

@@ -1,4 +0,0 @@
-import frappe
-from frappe.utils.doctor import doctor
-
-doctor()

build/frappe-worker/commands/migrate.py

@@ -1,47 +0,0 @@
-import os, frappe, compileall, re, json
-
-from frappe.migrate import migrate
-from frappe.utils import get_sites
-
-def get_config():
-    config = None
-    with open('common_site_config.json') as config_file:
-        config = json.load(config_file)
-    return config
-
-def save_config(config):
-    with open('common_site_config.json', 'w') as f:
-        return json.dump(config, f, indent=1, sort_keys=True)
-
-def set_maintenance_mode(enable=True):
-    conf = get_config()
-
-    if enable:
-        conf.update({ "maintenance_mode": 1, "pause_scheduler": 1 })
-        save_config(conf)
-
-    if not enable:
-        conf.update({ "maintenance_mode": 0, "pause_scheduler": 0 })
-        save_config(conf)
-
-
-installed_sites = ":".join(get_sites())
-sites = os.environ.get("SITES", installed_sites).split(":")
-maintenance_mode = True if os.environ.get("MAINTENANCE_MODE") else False
-
-if maintenance_mode:
-    set_maintenance_mode(True)
-
-for site in sites:
-    print('Migrating', site)
-    frappe.init(site=site)
-    frappe.connect()
-    try:
-        migrate()
-    finally:
-        frappe.destroy()
-
-if maintenance_mode:
-    set_maintenance_mode(False)
-
-exit(0)

build/frappe-worker/commands/worker.py

@@ -1,7 +0,0 @@
-import os, frappe
-from frappe.utils.background_jobs import start_worker
-
-queue = os.environ.get("WORKER_TYPE", "default")
-start_worker(queue, False)
-
-exit(0)

build/frappe-worker/common_site_config.json.template

@@ -1,7 +0,0 @@
-{
-    "db_host": "${MARIADB_HOST}",
-    "redis_cache": "redis://${REDIS_CACHE}",
-    "redis_queue": "redis://${REDIS_QUEUE}",
-    "redis_socketio": "redis://${REDIS_SOCKETIO}",
-    "socketio_port": ${SOCKETIO_PORT}
-}

build/frappe-worker/v11.Dockerfile

@@ -26,11 +26,11 @@ RUN virtualenv env \
     && git clone --depth 1 -o upstream https://github.com/frappe/frappe --branch version-11 \
     && pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/frappe
 
-COPY ./commands/* /home/frappe/frappe-bench/commands/
+COPY build/common/commands/* /home/frappe/frappe-bench/commands/
-COPY ./common_site_config.json.template /opt/frappe/common_site_config.json.template
+COPY build/common/common_site_config.json.template /opt/frappe/common_site_config.json.template
 
 # Setup docker-entrypoint
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+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

build/frappe-worker/v12.Dockerfile

@@ -29,11 +29,11 @@ RUN virtualenv env \
     && git clone --depth 1 -o upstream https://github.com/frappe/frappe --branch version-12 \
     && pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/frappe
 
-COPY ./commands/* /home/frappe/frappe-bench/commands/
+COPY build/common/commands/* /home/frappe/frappe-bench/commands/
-COPY ./common_site_config.json.template /opt/frappe/common_site_config.json.template
+COPY build/common/common_site_config.json.template /opt/frappe/common_site_config.json.template
 
 # Setup docker-entrypoint
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+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