From e72fe5d61b51b77c5f05bcaefce294bc635607ec Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Fri, 26 Mar 2021 17:34:29 +0100
Subject: [PATCH] Absolutely fucking sigh

---
 apps/cic-eth/docker/Dockerfile            | 11 +++++-
 apps/contract-migration/docker/Dockerfile |  2 +-
 apps/requirements.txt                     | 47 -----------------------
 3 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 apps/requirements.txt

diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile
index 6ed831b5..da5e780d 100644
--- a/apps/cic-eth/docker/Dockerfile
+++ b/apps/cic-eth/docker/Dockerfile
@@ -20,8 +20,15 @@ RUN apt-get update && \
 
 # Copy shared requirements from top of mono-repo
 RUN echo "copying root req file ${root_requirement_file}"
-COPY $root_requirement_file .
-RUN pip install -r $root_requirement_file $pip_extra_index_url_flag
+#COPY $root_requirement_file .
+#RUN pip install -r $root_requirement_file $pip_extra_index_url_flag
+RUN /usr/local/bin/python -m pip install --upgrade pip
+RUN git clone https://gitlab.com/grassrootseconomics/cic-base.git && \
+	cd cic-base && \
+	git checkout 7ae1f02efc206b13a65873567b0f6d1c3b7f9bc0 && \
+	python merge_requirements.py | tee merged_requirements.txt 
+RUN cd cic-base && \
+	pip install $pip_extra_index_url_flag -r ./merged_requirements.txt 
 
 COPY cic-eth/scripts/ scripts/
 COPY cic-eth/setup.cfg cic-eth/setup.py ./
diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile
index aaa328b7..bcbb8b74 100644
--- a/apps/contract-migration/docker/Dockerfile
+++ b/apps/contract-migration/docker/Dockerfile
@@ -58,7 +58,7 @@ USER grassroots
 
 ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
 ARG cic_base_version=0.1.2a30
-ARG cic_eth_version=0.10.1a5+build.80c76f2f
+ARG cic_eth_version=-0.10.1a5+build.4edf7d1e
 ARG sarafu_faucet_version=0.0.2a10
 ARG cic_contracts_version=0.0.2a2
 RUN pip install --user --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \
diff --git a/apps/requirements.txt b/apps/requirements.txt
deleted file mode 100644
index 59dccdae..00000000
--- a/apps/requirements.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-africastalking==1.2.3
-alembic==1.4.2
-bcrypt==3.2.0
-celery==4.4.7
-confini==0.3.6rc3
-crypto-dev-signer==0.4.13rc6
-cryptography==3.2.1
-ecuth==0.4.5a1
-eth-accounts-index==0.0.10a10
-eth-address-index==0.1.0a10
-eth-tester==0.5.0b3
-erc20-transfer-authorization==0.3.0a9
-erc20-single-shot-faucet==0.2.0a6
-faker==4.17.1
-http-hoba-auth==0.2.0
-moolb==0.1.1.b2
-phonenumbers==8.12.12
-psycopg2==2.8.6
-py-eth==0.1.1
-py-evm==0.3.0a20
-pytest==6.0.1
-pytest-alembic==0.2.5
-pytest-celery==0.0.0a1
-pytest-cov==2.10.1
-pytest-mock==3.3.1
-pytest-redis==2.0.0
-python-i18n==0.3.9
-PyYAML==5.3.1
-redis==3.5.3
-requests==2.24.0
-semver==2.13.0
-SQLAlchemy==1.3.20
-sqlparse==0.4.1
-tinydb==4.2.0
-transitions==0.8.4
-uWSGI==2.0.19.1
-vobject==0.9.6.1
-web3==5.12.2
-websockets==8.1
-yaml-acl==0.0.1
-rlp==2.0.1
-cryptocurrency-cli-tools==0.0.4
-giftable-erc20-token==0.0.7b12
-hexathon==0.0.1a3
-chainlib==0.0.1a25
-chainsyncer==0.0.1a19
-cic-registry==0.5.3.a22