diff --git a/apps/cic-cache/docker/Dockerfile b/apps/cic-cache/docker/Dockerfile index ed01fd54..83304027 100644 --- a/apps/cic-cache/docker/Dockerfile +++ b/apps/cic-cache/docker/Dockerfile @@ -43,10 +43,6 @@ COPY cic-cache/config/ /usr/local/etc/cic-cache/ RUN git clone https://github.com/vishnubob/wait-for-it.git /usr/local/bin/wait-for-it/ COPY cic-cache/cic_cache/db/migrations/ /usr/local/share/cic-cache/alembic/ -RUN git clone https://gitlab.com/grassrootseconomics/cic-contracts.git && \ - mkdir -p /usr/local/share/cic/solidity && \ - cp -R cic-contracts/abis /usr/local/share/cic/solidity/abi - COPY cic-cache/docker/start_tracker.sh ./start_tracker.sh COPY cic-cache/docker/db.sh ./db.sh RUN chmod 755 ./*.sh diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile index 00f3903a..27d8e5c1 100644 --- a/apps/cic-eth/docker/Dockerfile +++ b/apps/cic-eth/docker/Dockerfile @@ -50,8 +50,4 @@ COPY cic-eth/config/ /usr/local/etc/cic-eth/ COPY cic-eth/cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/ COPY cic-eth/crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ -RUN git clone https://gitlab.com/grassrootseconomics/cic-contracts.git && \ - mkdir -p /usr/local/share/cic/solidity && \ - cp -R cic-contracts/abis /usr/local/share/cic/solidity/abi - COPY util/liveness/health.sh /usr/local/bin/health.sh diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index 7f9f2b88..523703a5 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -31,15 +31,6 @@ RUN echo Install confini schema files && \ git checkout $cic_config_commit && \ cp -v *.ini $CONFINI_DIR -ARG cic_contracts_commit=698ef3a30fde8d7f2c498f1208fb0ff45d665501 -ARG cic_contracts_url=https://gitlab.com/grassrootseconomics/cic-contracts.git/ -RUN echo Install ABI collection for solidity interfaces used across all components && \ - git clone --depth 1 $cic_contracts_url cic-contracts && \ - cd cic-contracts && \ - git fetch --depth 1 origin $cic_contracts_commit && \ - git checkout $cic_contracts_commit && \ - make install - # Install nvm with node and npm # https://stackoverflow.com/questions/25899912/how-to-install-nvm-in-docker ENV NVM_DIR /root/.nvm @@ -64,9 +55,9 @@ ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433 ARG cic_base_version=0.1.2a79 ARG cic_eth_version=0.11.0b8+build.c2286e5c ARG sarafu_faucet_version=0.0.2a28 -ARG sarafu_token_version==0.0.1a6 +ARG sarafu_token_version=0.0.1a6 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 --index-url https://pypi.org/simple --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \ cic-eth==$cic_eth_version \ cic-contracts==$cic_contracts_version \ sarafu-faucet==$sarafu_faucet_version \