From 01466f0fd9de3e148f5fa126bea983f89250b054 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Wed, 30 Aug 2023 11:15:02 +0300 Subject: [PATCH] [v9.4.x] CI: Mount /root/.docker/ dir in authenticate-gcr step (#74076) CI: Mount /root/.docker/ dir in authenticate-gcr step (#73977) Mount /root/.docker/ dir (cherry picked from commit eea4adea292db94c38ea78d8963988530d0274a9) # Conflicts: # .drone.yml --- .drone.yml | 12 +++++++++++- scripts/drone/events/cron.star | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 831793b37ef..df758882e0e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3689,6 +3689,8 @@ steps: volumes: - name: docker path: /var/run/docker.sock + - name: config + path: /root/.docker/ - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana:latest depends_on: @@ -3743,6 +3745,8 @@ steps: volumes: - name: docker path: /var/run/docker.sock + - name: config + path: /root/.docker/ - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana:main depends_on: @@ -3797,6 +3801,8 @@ steps: volumes: - name: docker path: /var/run/docker.sock + - name: config + path: /root/.docker/ - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana:latest-ubuntu depends_on: @@ -3852,6 +3858,8 @@ steps: volumes: - name: docker path: /var/run/docker.sock + - name: config + path: /root/.docker/ - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana:main-ubuntu depends_on: @@ -3907,6 +3915,8 @@ steps: volumes: - name: docker path: /var/run/docker.sock + - name: config + path: /root/.docker/ - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/build-container:1.7.4 @@ -4207,6 +4217,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 924953dafba945a96a86eb6c7b7f278c7c47a0e83da6f15f980c15bfbf130b43 +hmac: 02f793b4c9aa5845d933c61b88a0405e4dd168ff4ce2a5b49cd8058dc30b516e ... diff --git a/scripts/drone/events/cron.star b/scripts/drone/events/cron.star index 2e7e83faa85..6715c175b17 100644 --- a/scripts/drone/events/cron.star +++ b/scripts/drone/events/cron.star @@ -32,7 +32,7 @@ def authenticate_gcr_step(): "environment": { "GCR_CREDENTIALS": from_secret("gcr_credentials"), }, - "volumes": [{"name": "docker", "path": "/var/run/docker.sock"}], + "volumes": [{"name": "docker", "path": "/var/run/docker.sock"}, {"name": "config", "path": "/root/.docker/"}], } def cron_job_pipeline(cronName, name, steps):