Sighhhhhhhh

This commit is contained in:
nolash 2021-03-26 18:07:58 +01:00
parent e72fe5d61b
commit da9d27606e
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
4 changed files with 12 additions and 11 deletions

View File

@ -23,12 +23,13 @@ RUN echo "copying root req file ${root_requirement_file}"
#COPY $root_requirement_file . #COPY $root_requirement_file .
#RUN pip install -r $root_requirement_file $pip_extra_index_url_flag #RUN pip install -r $root_requirement_file $pip_extra_index_url_flag
RUN /usr/local/bin/python -m pip install --upgrade pip RUN /usr/local/bin/python -m pip install --upgrade pip
RUN git clone https://gitlab.com/grassrootseconomics/cic-base.git && \ #RUN git clone https://gitlab.com/grassrootseconomics/cic-base.git && \
cd cic-base && \ # cd cic-base && \
git checkout 7ae1f02efc206b13a65873567b0f6d1c3b7f9bc0 && \ # git checkout 7ae1f02efc206b13a65873567b0f6d1c3b7f9bc0 && \
python merge_requirements.py | tee merged_requirements.txt # python merge_requirements.py | tee merged_requirements.txt
RUN cd cic-base && \ #RUN cd cic-base && \
pip install $pip_extra_index_url_flag -r ./merged_requirements.txt # 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/scripts/ scripts/
COPY cic-eth/setup.cfg cic-eth/setup.py ./ COPY cic-eth/setup.cfg cic-eth/setup.py ./

View File

@ -2,5 +2,5 @@
set -e set -e
>&2 echo executing database migration >&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 set +e

View File

@ -22,4 +22,4 @@ hexathon~=0.0.1a6
chainsyncer~=0.0.1a20 chainsyncer~=0.0.1a20
pysha3==1.0.2 pysha3==1.0.2
coincurve==15.0.0 coincurve==15.0.0
sarafu-faucet==0.0.2a10 sarafu-faucet==0.0.2a11

View File

@ -57,9 +57,9 @@ WORKDIR /home/grassroots
USER grassroots USER grassroots
ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433 ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
ARG cic_base_version=0.1.2a30 ARG cic_base_version=0.1.2a31
ARG cic_eth_version=-0.10.1a5+build.4edf7d1e ARG cic_eth_version=0.10.1a5+build.e72fe5d6
ARG sarafu_faucet_version=0.0.2a10 ARG sarafu_faucet_version=0.0.2a11
ARG cic_contracts_version=0.0.2a2 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 \ RUN pip install --user --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \
cic-eth==$cic_eth_version \ cic-eth==$cic_eth_version \