From da9d27606e79d0f4ad9a2c6655fc3fec1049095f Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Fri, 26 Mar 2021 18:07:58 +0100
Subject: [PATCH] Sighhhhhhhh

---
 apps/cic-eth/docker/Dockerfile            | 13 +++++++------
 apps/cic-eth/docker/db.sh                 |  2 +-
 apps/cic-eth/requirements.txt             |  2 +-
 apps/contract-migration/docker/Dockerfile |  6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile
index da5e780d..98d88d6c 100644
--- a/apps/cic-eth/docker/Dockerfile
+++ b/apps/cic-eth/docker/Dockerfile
@@ -23,12 +23,13 @@ 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
 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 
+#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 
+RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a31
 
 COPY cic-eth/scripts/ scripts/
 COPY cic-eth/setup.cfg cic-eth/setup.py ./
diff --git a/apps/cic-eth/docker/db.sh b/apps/cic-eth/docker/db.sh
index cbeb2ea3..5decedee 100644
--- a/apps/cic-eth/docker/db.sh
+++ b/apps/cic-eth/docker/db.sh
@@ -2,5 +2,5 @@
 
 set -e
 >&2 echo executing database migration
-migrate.py -c /usr/local/etc/cic-eth --migrations-dir /usr/local/share/cic-eth/alembic -vv
+python scripts/migrate.py -c /usr/local/etc/cic-eth --migrations-dir /usr/local/share/cic-eth/alembic -vv
 set +e
diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt
index c4443ddf..430b3d09 100644
--- a/apps/cic-eth/requirements.txt
+++ b/apps/cic-eth/requirements.txt
@@ -22,4 +22,4 @@ hexathon~=0.0.1a6
 chainsyncer~=0.0.1a20
 pysha3==1.0.2
 coincurve==15.0.0
-sarafu-faucet==0.0.2a10
+sarafu-faucet==0.0.2a11
diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile
index bcbb8b74..fc26b263 100644
--- a/apps/contract-migration/docker/Dockerfile
+++ b/apps/contract-migration/docker/Dockerfile
@@ -57,9 +57,9 @@ WORKDIR /home/grassroots
 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.4edf7d1e
-ARG sarafu_faucet_version=0.0.2a10
+ARG cic_base_version=0.1.2a31
+ARG cic_eth_version=0.10.1a5+build.e72fe5d6
+ARG sarafu_faucet_version=0.0.2a11
 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 \
 	cic-eth==$cic_eth_version \