From 548227311020a3d3bd84f641f84bc44ca20c77fe Mon Sep 17 00:00:00 2001
From: Jon Mease <jon.mease.dev@gmail.com>
Date: Sun, 27 Sep 2020 05:30:34 -0400
Subject: [PATCH] bundle artifacts in docker on Linux

---
 .circleci/config.yml                        | 2 +-
 repos/kaleido/py/setup.py                   | 3 +--
 repos/linux_scripts/bundle_artifacts        | 9 +++++++++
 repos/linux_scripts/bundle_artifacts_docker | 8 ++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100755 repos/linux_scripts/bundle_artifacts
 create mode 100755 repos/linux_scripts/bundle_artifacts_docker

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e8f0e115..023f05f4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ commands:
       - attach_workspace:
           at: ./repos
       - run: ./repos/linux_scripts/build_kaleido <<parameters.arch>>
-      - run: python ./repos/kaleido/py/setup.py bundle_hash_artifacts
+      - run: ./repos/linux_scripts/bundle_artifacts <<parameters.arch>>
       - store_artifacts:
           path: ./repos/kaleido/kaleido_artifacts_linux_<<parameters.arch>>.zip
       - persist_to_workspace:
diff --git a/repos/kaleido/py/setup.py b/repos/kaleido/py/setup.py
index c30d1eca..8d1467ab 100644
--- a/repos/kaleido/py/setup.py
+++ b/repos/kaleido/py/setup.py
@@ -1,5 +1,4 @@
-from __future__ import unicode_literals
-import setuptools
+from __future__ import unicode_literals, print_function
 import os
 import shutil
 from setuptools import setup, Command
diff --git a/repos/linux_scripts/bundle_artifacts b/repos/linux_scripts/bundle_artifacts
new file mode 100755
index 00000000..7f3df727
--- /dev/null
+++ b/repos/linux_scripts/bundle_artifacts
@@ -0,0 +1,9 @@
+#!/bin/bash
+if [ $# -eq 0 ]; then
+    echo "No architecture provided"
+    exit 1
+fi
+export KALEIDO_ARCH=$1
+
+# Perform build using docker
+docker run -it -v `pwd`/repos/:/repos  jonmmease/chromium-builder:0.8 /repos/linux_scripts/bundle_artifacts_docker $KALEIDO_ARCH
diff --git a/repos/linux_scripts/bundle_artifacts_docker b/repos/linux_scripts/bundle_artifacts_docker
new file mode 100755
index 00000000..5c4d8d3c
--- /dev/null
+++ b/repos/linux_scripts/bundle_artifacts_docker
@@ -0,0 +1,8 @@
+#!/bin/bash
+if [ $# -eq 0 ]; then
+    echo "No architecture provided"
+    exit 1
+fi
+export KALEIDO_ARCH=$1
+
+python3 /repos/kaleido/py/setup.py bundle_hash_artifacts