From 993044e28b43da97d653fc33f03ee41b05792741 Mon Sep 17 00:00:00 2001 From: Robert Fratto <robert.fratto@grafana.com> Date: Mon, 9 Sep 2019 18:40:40 -0400 Subject: [PATCH] ci/drone: fix deploy command by escaping double quotes in JSON body --- .drone/drone.jsonnet | 2 +- .drone/drone.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet index 135f13ec..bc4e6bc4 100644 --- a/.drone/drone.jsonnet +++ b/.drone/drone.jsonnet @@ -130,7 +130,7 @@ local drone = [ CIRLCE_TOKEN: {from_secret: "circle_token"} }, commands: [ - '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' + '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 84078a95..35fae368 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -429,9 +429,9 @@ kind: pipeline name: deploy steps: - commands: - - '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' + - '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 -- GitLab