Skip to content

Commit d284d5f

Browse files
AgnesTouletAgnesToulet
authored
Drone: Fix push to Docker step (#469)
* Drone: Fix push to Docker step * fix tags and remove comment
1 parent 2764e6b commit d284d5f

File tree

4 files changed

+39
-40
lines changed

4 files changed

+39
-40
lines changed

‎.drone.yml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ steps:
5151
name: security-scan
5252
- commands:
5353
- . ~/.init-nvm.sh
54-
- sh scripts/package_target.sh linux-x64-glibc
54+
- ./scripts/package_target.sh linux-x64-glibc
5555
- bin/grabpl build-plugin-manifest ./dist/plugin-linux-x64-glibc || true
56-
- sh scripts/archive_target.sh linux-x64-glibc
56+
- ./scripts/archive_target.sh linux-x64-glibc
5757
depends_on:
5858
- yarn-build
5959
environment:
@@ -63,9 +63,9 @@ steps:
6363
name: package-linux-x64-glibc
6464
- commands:
6565
- . ~/.init-nvm.sh
66-
- sh scripts/package_target.sh darwin-x64-unknown
66+
- ./scripts/package_target.sh darwin-x64-unknown
6767
- bin/grabpl build-plugin-manifest ./dist/plugin-darwin-x64-unknown || true
68-
- sh scripts/archive_target.sh darwin-x64-unknown
68+
- ./scripts/archive_target.sh darwin-x64-unknown
6969
depends_on:
7070
- yarn-build
7171
environment:
@@ -75,9 +75,9 @@ steps:
7575
name: package-darwin-x64-unknown
7676
- commands:
7777
- . ~/.init-nvm.sh
78-
- sh scripts/package_target.sh win32-x64-unknown
78+
- ./scripts/package_target.sh win32-x64-unknown
7979
- bin/grabpl build-plugin-manifest ./dist/plugin-win32-x64-unknown || true
80-
- sh scripts/archive_target.sh win32-x64-unknown
80+
- ./scripts/archive_target.sh win32-x64-unknown
8181
depends_on:
8282
- yarn-build
8383
environment:
@@ -87,10 +87,10 @@ steps:
8787
name: package-win32-x64-unknown
8888
- commands:
8989
- . ~/.init-nvm.sh
90-
- sh scripts/package_target.sh linux-x64-glibc true plugin-linux-x64-glibc-no-chromium
90+
- ./scripts/package_target.sh linux-x64-glibc true plugin-linux-x64-glibc-no-chromium
9191
- bin/grabpl build-plugin-manifest ./dist/plugin-linux-x64-glibc-no-chromium ||
9292
true
93-
- sh scripts/archive_target.sh linux-x64-glibc plugin-linux-x64-glibc-no-chromium
93+
- ./scripts/archive_target.sh linux-x64-glibc plugin-linux-x64-glibc-no-chromium
9494
depends_on:
9595
- yarn-build
9696
environment:
@@ -159,9 +159,9 @@ steps:
159159
name: security-scan
160160
- commands:
161161
- . ~/.init-nvm.sh
162-
- sh scripts/package_target.sh linux-x64-glibc
162+
- ./scripts/package_target.sh linux-x64-glibc
163163
- bin/grabpl build-plugin-manifest ./dist/plugin-linux-x64-glibc
164-
- sh scripts/archive_target.sh linux-x64-glibc
164+
- ./scripts/archive_target.sh linux-x64-glibc
165165
depends_on:
166166
- yarn-build
167167
environment:
@@ -171,9 +171,9 @@ steps:
171171
name: package-linux-x64-glibc
172172
- commands:
173173
- . ~/.init-nvm.sh
174-
- sh scripts/package_target.sh darwin-x64-unknown
174+
- ./scripts/package_target.sh darwin-x64-unknown
175175
- bin/grabpl build-plugin-manifest ./dist/plugin-darwin-x64-unknown
176-
- sh scripts/archive_target.sh darwin-x64-unknown
176+
- ./scripts/archive_target.sh darwin-x64-unknown
177177
depends_on:
178178
- yarn-build
179179
environment:
@@ -183,9 +183,9 @@ steps:
183183
name: package-darwin-x64-unknown
184184
- commands:
185185
- . ~/.init-nvm.sh
186-
- sh scripts/package_target.sh win32-x64-unknown
186+
- ./scripts/package_target.sh win32-x64-unknown
187187
- bin/grabpl build-plugin-manifest ./dist/plugin-win32-x64-unknown
188-
- sh scripts/archive_target.sh win32-x64-unknown
188+
- ./scripts/archive_target.sh win32-x64-unknown
189189
depends_on:
190190
- yarn-build
191191
environment:
@@ -195,9 +195,9 @@ steps:
195195
name: package-win32-x64-unknown
196196
- commands:
197197
- . ~/.init-nvm.sh
198-
- sh scripts/package_target.sh linux-x64-glibc true plugin-linux-x64-glibc-no-chromium
198+
- ./scripts/package_target.sh linux-x64-glibc true plugin-linux-x64-glibc-no-chromium
199199
- bin/grabpl build-plugin-manifest ./dist/plugin-linux-x64-glibc-no-chromium
200-
- sh scripts/archive_target.sh linux-x64-glibc plugin-linux-x64-glibc-no-chromium
200+
- ./scripts/archive_target.sh linux-x64-glibc plugin-linux-x64-glibc-no-chromium
201201
depends_on:
202202
- yarn-build
203203
environment:
@@ -206,7 +206,7 @@ steps:
206206
image: grafana/grafana-plugin-ci:1.9.0
207207
name: package-linux-x64-glibc-no-chromium
208208
- commands:
209-
- sh scripts/build_push_docker.sh master
209+
- ./scripts/build_push_docker.sh master
210210
environment:
211211
DOCKER_PASS:
212212
from_secret: docker_pass
@@ -281,9 +281,9 @@ steps:
281281
name: security-scan
282282
- commands:
283283
- . ~/.init-nvm.sh
284-
- sh scripts/package_target.sh linux-x64-glibc
284+
- ./scripts/package_target.sh linux-x64-glibc
285285
- bin/grabpl build-plugin-manifest ./dist/plugin-linux-x64-glibc
286-
- sh scripts/archive_target.sh linux-x64-glibc
286+
- ./scripts/archive_target.sh linux-x64-glibc
287287
depends_on:
288288
- yarn-build
289289
environment:
@@ -293,9 +293,9 @@ steps:
293293
name: package-linux-x64-glibc
294294
- commands:
295295
- . ~/.init-nvm.sh
296-
- sh scripts/package_target.sh darwin-x64-unknown
296+
- ./scripts/package_target.sh darwin-x64-unknown
297297
- bin/grabpl build-plugin-manifest ./dist/plugin-darwin-x64-unknown
298-
- sh scripts/archive_target.sh darwin-x64-unknown
298+
- ./scripts/archive_target.sh darwin-x64-unknown
299299
depends_on:
300300
- yarn-build
301301
environment:
@@ -305,9 +305,9 @@ steps:
305305
name: package-darwin-x64-unknown
306306
- commands:
307307
- . ~/.init-nvm.sh
308-
- sh scripts/package_target.sh win32-x64-unknown
308+
- ./scripts/package_target.sh win32-x64-unknown
309309
- bin/grabpl build-plugin-manifest ./dist/plugin-win32-x64-unknown
310-
- sh scripts/archive_target.sh win32-x64-unknown
310+
- ./scripts/archive_target.sh win32-x64-unknown
311311
depends_on:
312312
- yarn-build
313313
environment:
@@ -317,9 +317,9 @@ steps:
317317
name: package-win32-x64-unknown
318318
- commands:
319319
- . ~/.init-nvm.sh
320-
- sh scripts/package_target.sh linux-x64-glibc true plugin-linux-x64-glibc-no-chromium
320+
- ./scripts/package_target.sh linux-x64-glibc true plugin-linux-x64-glibc-no-chromium
321321
- bin/grabpl build-plugin-manifest ./dist/plugin-linux-x64-glibc-no-chromium
322-
- sh scripts/archive_target.sh linux-x64-glibc plugin-linux-x64-glibc-no-chromium
322+
- ./scripts/archive_target.sh linux-x64-glibc plugin-linux-x64-glibc-no-chromium
323323
depends_on:
324324
- yarn-build
325325
environment:
@@ -328,8 +328,8 @@ steps:
328328
image: grafana/grafana-plugin-ci:1.9.0
329329
name: package-linux-x64-glibc-no-chromium
330330
- commands:
331-
- sh scripts/generate_md5sum.sh
332-
- sh scripts/publish_github_release.sh
331+
- ./scripts/generate_md5sum.sh
332+
- ./scripts/publish_github_release.sh
333333
depends_on:
334334
- package-linux-x64-glibc
335335
- package-darwin-x64-unknown
@@ -341,7 +341,7 @@ steps:
341341
image: cibuilds/github:0.13.0
342342
name: publish_to_github
343343
- commands:
344-
- sh scripts/build_push_docker.sh
344+
- ./scripts/build_push_docker.sh
345345
depends_on:
346346
- publish_to_github
347347
environment:
@@ -358,7 +358,7 @@ steps:
358358
- commands:
359359
- . ~/.init-nvm.sh
360360
- yarn run create-gcom-plugin-json ${DRONE_COMMIT}
361-
- sh scripts/push-to-gcom.sh
361+
- ./scripts/push-to-gcom.sh
362362
depends_on:
363363
- publish_to_github
364364
environment:
@@ -414,6 +414,6 @@ kind: secret
414414
name: srcclr_api_token
415415
---
416416
kind: signature
417-
hmac: e6b99f052740c6862015a124564b85182f9877f4eccc159334a40000faf3a008
417+
hmac: f130230eb86344632de732a9fa4fe1155c622537fbe3c61d9fc1d8b17a4cacea
418418

419419
...

‎scripts/build_push_docker.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ fi
1212

1313
echo "building ${TAG}"
1414
echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
15-
tags=()
16-
tags+=${IMAGE_NAME}:${TAG}
15+
tags=("-t ${IMAGE_NAME}:${TAG}")
1716
if [ -z "$(echo $TAG | grep -E "beta|master")" ]; then
18-
tags+={IMAGE_NAME}:latest
17+
tags+=("-t ${IMAGE_NAME}:latest")
1918
fi
2019

21-
docker buildx build --platform linux/amd64,linux/arm64 --push -t ${tags[@]} .
20+
docker buildx build --platform linux/amd64,linux/arm64 --push ${tags[@]} .

‎scripts/drone/common.star‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ def build_step():
2828
}
2929

3030
def package_step(arch, name='', skip_chromium=False, override_output='', skip_errors=True):
31-
pkg_cmd = 'sh scripts/package_target.sh {}'.format(arch)
31+
pkg_cmd = './scripts/package_target.sh {}'.format(arch)
3232
bpm_cmd = 'bin/grabpl build-plugin-manifest ./dist/'
33-
arc_cmd = 'sh scripts/archive_target.sh {}'.format(arch)
33+
arc_cmd = './scripts/archive_target.sh {}'.format(arch)
3434

3535
if skip_chromium:
3636
pkg_cmd += ' true {}'.format(override_output)

‎scripts/drone/promotion.star‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ def publish_gh_release():
66
'name': 'publish_to_github',
77
'image': 'cibuilds/github:0.13.0',
88
'commands': [
9-
'sh scripts/generate_md5sum.sh',
10-
'sh scripts/publish_github_release.sh',
9+
'./scripts/generate_md5sum.sh',
10+
'./scripts/publish_github_release.sh',
1111
],
1212
'environment': {
1313
'GITHUB_TOKEN': from_secret('github_token'),
@@ -40,7 +40,7 @@ def publish_to_docker():
4040
'DOCKER_USER': from_secret('docker_user'),
4141
'DOCKER_PASS': from_secret('docker_pass'),
4242
},
43-
'commands': ['sh scripts/build_push_docker.sh'],
43+
'commands': ['./scripts/build_push_docker.sh'],
4444
'volumes': [{'name': 'docker', 'path': '/var/run/docker.sock'}],
4545
}
4646

@@ -51,7 +51,7 @@ def publish_to_gcom():
5151
'commands': [
5252
'. ~/.init-nvm.sh',
5353
'yarn run create-gcom-plugin-json ${DRONE_COMMIT}',
54-
'sh scripts/push-to-gcom.sh',
54+
'./scripts/push-to-gcom.sh',
5555
],
5656
'environment': {
5757
'GCOM_URL': from_secret('gcom_url'),

0 commit comments

Comments
 (0)