From f5071122ed5de3f8209b54f4ba2da1af44ccceb3 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sun, 28 Jun 2020 05:55:15 +0530 Subject: [PATCH] fix: erpnext image build improve travis.py python packages not installed in editable mode use venv module instead of virtualenv --- build/common/worker/install_app.sh | 2 +- build/erpnext-nginx/Dockerfile | 4 +- build/erpnext-worker/Dockerfile | 2 +- build/frappe-worker/Dockerfile | 4 +- travis.py | 88 ++++++++++++++++-------------- 5 files changed, 54 insertions(+), 46 deletions(-) diff --git a/build/common/worker/install_app.sh b/build/common/worker/install_app.sh index c378be17..5f1023ec 100755 --- a/build/common/worker/install_app.sh +++ b/build/common/worker/install_app.sh @@ -13,4 +13,4 @@ cd ./apps [ "${APP_BRANCH}" ] && BRANCH="-b ${APP_BRANCH}" git clone --depth 1 -o upstream ${APP_REPO} ${BRANCH} -pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/${APP_NAME} \ No newline at end of file +pip3 install --no-cache-dir /home/frappe/frappe-bench/apps/${APP_NAME} \ No newline at end of file diff --git a/build/erpnext-nginx/Dockerfile b/build/erpnext-nginx/Dockerfile index 5e88c5fd..c814a6cd 100644 --- a/build/erpnext-nginx/Dockerfile +++ b/build/erpnext-nginx/Dockerfile @@ -1,12 +1,12 @@ ARG NODE_IMAGE_TAG=12-prod +ARG GIT_BRANCH=develop FROM bitnami/node:${NODE_IMAGE_TAG} +ARG GIT_BRANCH COPY build/erpnext-nginx/install_app.sh /install_app -ARG GIT_BRANCH=develop RUN /install_app erpnext https://github.com/frappe/erpnext ${GIT_BRANCH} -ARG GIT_BRANCH=develop FROM frappe/frappe-nginx:${GIT_BRANCH} COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/ diff --git a/build/erpnext-worker/Dockerfile b/build/erpnext-worker/Dockerfile index 6f6296ab..90aad213 100644 --- a/build/erpnext-worker/Dockerfile +++ b/build/erpnext-worker/Dockerfile @@ -1,5 +1,5 @@ ARG GIT_BRANCH=develop FROM frappe/frappe-worker:${GIT_BRANCH} -ARG GIT_BRANCH=develop +ARG GIT_BRANCH RUN install_app erpnext https://github.com/frappe/erpnext ${GIT_BRANCH} diff --git a/build/frappe-worker/Dockerfile b/build/frappe-worker/Dockerfile index 3e8190b5..d7bd1667 100644 --- a/build/frappe-worker/Dockerfile +++ b/build/frappe-worker/Dockerfile @@ -32,11 +32,11 @@ RUN install_packages \ RUN mkdir -p apps logs commands /home/frappe/backups # Setup python environment -RUN virtualenv env \ +RUN python -m venv env \ && . env/bin/activate \ && cd apps \ && git clone --depth 1 -o upstream https://github.com/frappe/frappe --branch ${GIT_BRANCH} \ - && pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/frappe + && pip3 install --no-cache-dir /home/frappe/frappe-bench/apps/frappe # Copy scripts and templates COPY build/common/commands/* /home/frappe/frappe-bench/commands/ diff --git a/travis.py b/travis.py index 854e9313..f8224053 100755 --- a/travis.py +++ b/travis.py @@ -4,61 +4,69 @@ import argparse import subprocess import os -parser = argparse.ArgumentParser(description='frappe_docker common CI elements', add_help=True) +def parse_args(): + parser = argparse.ArgumentParser(description='frappe_docker common CI elements', add_help=True) -parser.add_argument('service', action='store', type=str, help='Name of the service to build: "erpnext" or "frappe"') -parser.add_argument('-o', '--tag-only', required=False, action='store_true', dest='tag_only', help='Only tag an image and push it.') + parser.add_argument('service', action='store', type=str, help='Name of the service to build: "erpnext" or "frappe"') + parser.add_argument('-o', '--tag-only', required=False, action='store_true', dest='tag_only', help='Only tag an image and push it.') -image_type = parser.add_mutually_exclusive_group(required=True) -image_type.add_argument('-a', '--nginx', action='store_const', dest='image_type', const='nginx', help='Build the nginx + static assets image') -image_type.add_argument('-s', '--socketio', action='store_const', dest='image_type', const='socketio', help='Build the frappe-socketio image') -image_type.add_argument('-w', '--worker', action='store_const', dest='image_type', const='worker', help='Build the python environment image') + image_type = parser.add_mutually_exclusive_group(required=True) + image_type.add_argument('-a', '--nginx', action='store_const', dest='image_type', const='nginx', help='Build the nginx + static assets image') + image_type.add_argument('-s', '--socketio', action='store_const', dest='image_type', const='socketio', help='Build the frappe-socketio image') + image_type.add_argument('-w', '--worker', action='store_const', dest='image_type', const='worker', help='Build the python environment image') -tag_type = parser.add_mutually_exclusive_group(required=True) -tag_type.add_argument('-g', '--git-version', action='store', type=str, dest='version', help='The version number of service (i.e. "11", "12", etc.)') -tag_type.add_argument('-t', '--tag', action='store', type=str, dest='tag', help='The image tag (i.e. erpnext-worker:$TAG )') + tag_type = parser.add_mutually_exclusive_group(required=True) + tag_type.add_argument('-g', '--git-version', action='store', type=str, dest='version', help='The version number of service (i.e. "11", "12", etc.)') + tag_type.add_argument('-t', '--tag', action='store', type=str, dest='tag', help='The image tag (i.e. erpnext-worker:$TAG )') + + args = parser.parse_args() + return args -args = parser.parse_args() def git_version(service, version, branch): - print(f'Pulling {service} v{version}') - subprocess.run(f'git clone https://github.com/frappe/{service} --branch {branch}', shell=True) - cd = os.getcwd() - os.chdir(os.getcwd() + f'/{service}') - subprocess.run('git fetch --tags', shell=True) + print(f'Pulling {service} v{version}') + subprocess.run(f'git clone https://github.com/frappe/{service} --branch {branch}', shell=True) + cd = os.getcwd() + os.chdir(os.getcwd() + f'/{service}') + subprocess.run('git fetch --tags', shell=True) - # XX-beta becomes XX for tags search - version = version.split('-')[0] + # XX-beta becomes XX for tags search + version = version.split('-')[0] + + version_tag = subprocess.check_output(f'git tag --list --sort=-version:refname "v{version}*" | sed -n 1p | sed -e \'s#.*@\(\)#\\1#\'', shell=True).strip().decode('ascii') + os.chdir(cd) + return version_tag - version_tag = subprocess.check_output(f'git tag --list --sort=-version:refname "v{version}*" | sed -n 1p | sed -e \'s#.*@\(\)#\\1#\'', shell=True).strip().decode('ascii') - os.chdir(cd) - return version_tag def build(service, tag, image, branch): - build_args = f'--build-arg GIT_BRANCH={branch}' - if service == 'nginx' and branch == 'version-11': - build_args += f' --build-arg NODE_IMAGE_TAG=10-prod' + build_args = f'--build-arg GIT_BRANCH={branch}' + if service == 'nginx' and branch == 'version-11': + build_args += f' --build-arg NODE_IMAGE_TAG=10-prod' + + print(f'Building {service} {image} image') + subprocess.run(f'docker build {build_args} -t {service}-{image} -f build/{service}-{image}/Dockerfile .', shell=True) + tag_and_push(f'{service}-{image}', tag) - print(f'Building {service} {image} image') - subprocess.run(f'docker build {build_args} -t {service}-{image} -f build/{service}-{image}/Dockerfile .', shell=True) - tag_and_push(f'{service}-{image}', tag) def tag_and_push(image_name, tag): - print(f'Tagging {image_name} as "{tag}" and pushing') - subprocess.run(f'docker tag {image_name} frappe/{image_name}:{tag}', shell=True) - subprocess.run(f'docker push frappe/{image_name}:{tag}', shell=True) + print(f'Tagging {image_name} as "{tag}" and pushing') + subprocess.run(f'docker tag {image_name} frappe/{image_name}:{tag}', shell=True) + subprocess.run(f'docker push frappe/{image_name}:{tag}', shell=True) + def main(): - tag = args.tag - branch = 'develop' + args = parse_args() + tag = args.tag + branch = 'develop' - if args.version: - branch = 'version-' + args.version - tag = git_version(args.service, args.version, branch) + if args.version: + branch = 'version-' + args.version + tag = git_version(args.service, args.version, branch) - if args.tag_only: - tag_and_push(f'{args.service}-{args.image_type}', tag) - else: - build(args.service, tag, args.image_type, branch) + if args.tag_only: + tag_and_push(f'{args.service}-{args.image_type}', tag) + else: + build(args.service, tag, args.image_type, branch) -main() +if __name__ == "__main__": + main()