Skip to content

Commit 8d390d8

Browse files
committed
Change scripts to use single-binary image
Signed-off-by: Bryan Boreham <[email protected]>
1 parent eb8f771 commit 8d390d8

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

integration-tests/start-components.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ docker network create cortex
99

1010
docker run $RUN_ARGS -d --name=consul --hostname=consul consul:0.9 agent -ui -server -client=0.0.0.0 -bootstrap
1111
docker run $RUN_ARGS -d --name=dynamodb --hostname=dynamodb amazon/dynamodb-local:1.11.477 -jar DynamoDBLocal.jar -inMemory -sharedDb
12-
docker run $RUN_ARGS -d --name=distributor --hostname=distributor -p 8080:80 quay.io/cortexproject/distributor:$IMAGE_TAG $COMMON_ARGS -distributor.replication-factor=1
12+
docker run $RUN_ARGS -d --name=distributor --hostname=distributor -p 8080:80 quay.io/cortexproject/cortex:$IMAGE_TAG -target=distributor $COMMON_ARGS -distributor.replication-factor=1

integration-tests/test-flush.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ set -e
99
# TODO: wait for DynamoDB ready
1010
sleep 5
1111
echo Start table-manager
12-
docker run $RUN_ARGS -d --name=tm --hostname=tm --restart=always quay.io/cortexproject/table-manager:$IMAGE_TAG $STORAGE_ARGS
12+
docker run $RUN_ARGS -d --name=tm --hostname=tm --restart=always quay.io/cortexproject/cortex:$IMAGE_TAG -target=table-manager $STORAGE_ARGS
1313

1414
echo Start ingester
15-
docker run $RUN_ARGS -d --name=i1 --hostname=i1 quay.io/cortexproject/ingester:$IMAGE_TAG $INGESTER_ARGS
15+
docker run $RUN_ARGS -d --name=i1 --hostname=i1 quay.io/cortexproject/cortex:$IMAGE_TAG -target=ingester $INGESTER_ARGS
1616

1717
sleep 5
1818
I1_ADDR=$(container_ip i1)

integration-tests/test-handover.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -e
99
# Note we haven't created any tables in the DB yet - we aren't going to run long enough to flush anything
1010

1111
echo Start first ingester
12-
docker run $RUN_ARGS -d --name=i1 --hostname=i1 quay.io/cortexproject/ingester:$IMAGE_TAG $INGESTER_ARGS -ingester.claim-on-rollout=true
12+
docker run $RUN_ARGS -d --name=i1 --hostname=i1 quay.io/cortexproject/cortex:$IMAGE_TAG -target=ingester $INGESTER_ARGS -ingester.claim-on-rollout=true
1313

1414
I1_ADDR=$(container_ip i1)
1515
wait_for "run_curl -s -f -m 3 http://$I1_ADDR:/ready" "ingester ready"
@@ -23,7 +23,7 @@ wait_for "has_tokens_owned $DIST_ADDR" "distributor to see ingester in ring"
2323
docker run $RUN_ARGS --rm weaveworks/avalanche:remote-write --metric-count=2 --label-count=2 --series-count=2 --remote-url=http://distributor/api/prom/push
2424

2525
echo Start second ingester, waiting for first
26-
docker run $RUN_ARGS -d --name=i2 --hostname=i2 quay.io/cortexproject/ingester:$IMAGE_TAG $INGESTER_ARGS -ingester.join-after=300s -ingester.claim-on-rollout=true
26+
docker run $RUN_ARGS -d --name=i2 --hostname=i2 quay.io/cortexproject/cortex:$IMAGE_TAG -target=ingester $INGESTER_ARGS -ingester.join-after=300s -ingester.claim-on-rollout=true
2727

2828
echo Stop first ingester so it should hand over
2929
docker stop i1

0 commit comments

Comments
 (0)