From c6e9b2aeabf7fb85e998f9ce1fab63731d8c8286 Mon Sep 17 00:00:00 2001 From: Theo Butler Date: Tue, 23 Jan 2024 14:55:36 -0500 Subject: [PATCH] fix(indexer): remove addressbook hack --- indexer/agent.sh | 9 +-------- indexer/indexer-ts.dockerfile | 4 +--- indexer/service.sh | 9 +-------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/indexer/agent.sh b/indexer/agent.sh index 7c9f91d..364bf6c 100644 --- a/indexer/agent.sh +++ b/indexer/agent.sh @@ -3,16 +3,9 @@ set -euf if [ ! -d "build/graphprotocol/indexer" ]; then mkdir -p build/graphprotocol/indexer - git clone git@github.com:graphprotocol/indexer build/graphprotocol/indexer --branch 'theodus/local-net' + git clone git@github.com:graphprotocol/indexer build/graphprotocol/indexer --branch 'main' fi -# TODO: temporary hack. see https://github.com/graphprotocol/common-ts/pull/114, https://github.com/graphprotocol/indexer/pull/818 -if [ ! -d "build/graphprotocol/common-ts" ]; then - mkdir -p build/graphprotocol/common-ts - git clone git@github.com:graphprotocol/common-ts build/graphprotocol/common-ts --branch 'theodus/local-net' -fi -(cd build/graphprotocol/common-ts/ && yarn) - . ./.env until curl -s "http://${DOCKER_GATEWAY_HOST}:${CONTROLLER}" >/dev/null; do sleep 1; done diff --git a/indexer/indexer-ts.dockerfile b/indexer/indexer-ts.dockerfile index f5ff2d3..ac0c353 100644 --- a/indexer/indexer-ts.dockerfile +++ b/indexer/indexer-ts.dockerfile @@ -4,9 +4,7 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* WORKDIR /opt/ -RUN git clone https://github.com/graphprotocol/common-ts build/graphprotocol/common-ts --branch 'theodus/local-net' -RUN cd build/graphprotocol/common-ts && yarn -RUN git clone https://github.com/graphprotocol/indexer build/graphprotocol/indexer --branch 'theodus/local-net' +RUN git clone https://github.com/graphprotocol/indexer build/graphprotocol/indexer --branch 'v0.20.23' RUN cd build/graphprotocol/indexer && yarn --frozen-lockfile --non-interactive COPY ./.env /opt/ diff --git a/indexer/service.sh b/indexer/service.sh index 40f55fa..d0e01ca 100644 --- a/indexer/service.sh +++ b/indexer/service.sh @@ -3,16 +3,9 @@ set -euf if [ ! -d "build/graphprotocol/indexer" ]; then mkdir -p build/graphprotocol/indexer - git clone git@github.com:graphprotocol/indexer build/graphprotocol/indexer --branch 'theodus/local-net' + git clone git@github.com:graphprotocol/indexer build/graphprotocol/indexer --branch 'main' fi -# TODO: temporary hack. see https://github.com/graphprotocol/common-ts/pull/114, https://github.com/graphprotocol/indexer/pull/818 -if [ ! -d "build/graphprotocol/common-ts" ]; then - mkdir -p build/graphprotocol/common-ts - git clone git@github.com:graphprotocol/common-ts build/graphprotocol/common-ts --branch 'theodus/local-net' -fi -(cd build/graphprotocol/common-ts/ && yarn) - . ./.env until curl -s "http://${DOCKER_GATEWAY_HOST}:${CONTROLLER}" >/dev/null; do sleep 1; done