diff --git a/apps/contract-migration/docker/Dockerfile_ci b/apps/contract-migration/docker/Dockerfile_ci deleted file mode 100644 index 4a983449..00000000 --- a/apps/contract-migration/docker/Dockerfile_ci +++ /dev/null @@ -1,44 +0,0 @@ -# syntax = docker/dockerfile:1.2 -FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e - -WORKDIR /root - -RUN touch /etc/apt/sources.list.d/ethereum.list -RUN echo 'deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main' > /etc/apt/sources.list.d/ethereum.list -RUN echo 'deb-src http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main' >> /etc/apt/sources.list.d/ethereum.list -RUN cat /etc/apt/sources.list.d/ethereum.list -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 2A518C819BE37D2C2031944D1C52189C923F6CA9 - -#RUN apt-get install solc - -RUN mkdir -vp /usr/local/etc/cic - -ENV CONFINI_DIR /usr/local/etc/cic/ - - -COPY config_template/ /usr/local/etc/cic/ -COPY requirements.txt . -COPY override_requirements.txt . - -ARG pip_index_url=https://pypi.org/simple -ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" -ARG EXTRA_PIP_ARGS="" -ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple" -ARG pip_trusted_host=pypi.org -RUN pip install --index-url https://pypi.org/simple \ - pip install --index-url https://pypi.org/simple \ - --pre \ - --force-reinstall \ - --trusted-host $pip_trusted_host \ - --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS \ - -r requirements.txt - -RUN pip install --index-url https://pypi.org/simple \ - --force-reinstall \ - --pre \ - --trusted-host $pip_trusted_host \ - --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS \ - -r override_requirements.txt - -COPY . . -RUN chmod +x *.sh diff --git a/apps/contract-migration/reset.sh b/apps/contract-migration/reset.sh index 5a1dc532..feb5acbb 100755 --- a/apps/contract-migration/reset.sh +++ b/apps/contract-migration/reset.sh @@ -3,6 +3,8 @@ set -a . ${DEV_DATA_DIR}/env_reset +WAIT_FOR_TIMEOUT=${WAIT_FOR_TIMEOUT:-60} + set -e @@ -24,7 +26,7 @@ if [ ! -z "$DEV_USE_DOCKER_WAIT_SCRIPT" ]; then read -i "/" rpc_provider_port <<< "${p[2]}" rpc_provider_host=${p[1]:2} echo "waiting for provider host $rpc_provider_host port $rpc_provider_port..." - ./wait-for-it.sh "$rpc_provider_host:$rpc_provider_port" + ./wait-for-it.sh "$rpc_provider_host:$rpc_provider_port" -t $WAIT_FOR_TIMEOUT fi if [ "$TOKEN_TYPE" == "giftable_erc20_token" ]; then diff --git a/docker-compose.yml b/docker-compose.yml index 960bb9b5..46013705 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,6 +73,7 @@ services: # image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/contract-migration:latest environment: RPC_PROVIDER: ${RPC_PROVIDER:-http://eth:8545} + ETH_PROVIDER: ${RPC_PROVIDER:-http://eth:8545} DEV_USE_DOCKER_WAIT_SCRIPT: 1 CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996} CIC_CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996}