From 4384371bc84b93e9455763a278879c73bf521896 Mon Sep 17 00:00:00 2001 From: Edward Welch Date: Mon, 9 Sep 2019 18:22:55 -0400 Subject: [PATCH] use the loki-build-image for calling circle, this is the same as what the circle job we are replacing did --- .drone/drone.jsonnet | 3 +-- .drone/drone.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet index 42f9efa91202..135f13ec64b3 100644 --- a/.drone/drone.jsonnet +++ b/.drone/drone.jsonnet @@ -125,12 +125,11 @@ local drone = [ steps: [ { name: "trigger", - image: 'alpine', + image: 'grafana/loki-build-image:%s' % build_image_version, environment: { CIRLCE_TOKEN: {from_secret: "circle_token"} }, commands: [ - "apk add --no-cache curl make bash git", 'curl -s --header "Content-Type: application/json" --data "{\"build_parameters\": {\"CIRCLE_JOB\": \"deploy\", \"IMAGE_NAMES\": \"$(make print-images)\"}}" --request POST https://circleci.com/api/v1.1/project/github/raintank/deployment_tools/tree/master?circle-token=$CIRCLE_TOKEN' ] } diff --git a/.drone/drone.yml b/.drone/drone.yml index 705efe413eb1..84078a9507bf 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -429,14 +429,13 @@ kind: pipeline name: deploy steps: - commands: - - apk add --no-cache curl make bash git - 'curl -s --header "Content-Type: application/json" --data "{"build_parameters": {"CIRCLE_JOB": "deploy", "IMAGE_NAMES": "$(make print-images)"}}" --request POST https://circleci.com/api/v1.1/project/github/raintank/deployment_tools/tree/master?circle-token=$CIRCLE_TOKEN' environment: CIRLCE_TOKEN: from_secret: circle_token - image: alpine + image: grafana/loki-build-image:0.5.0 name: trigger trigger: ref: